196 files changed, 1999 insertions, 1209 deletions

diff --git a/.mailmap b/.mailmap
index 08b80428f583..779a9caadc7f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -89,6 +89,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
 Linas Vepstas <linas@austin.ibm.com>
 Mark Brown <broonie@sirena.org.uk>
 Matthieu CASTET <castet.matthieu@free.fr>
+Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com>
 Mayuresh Janorkar <mayur@ti.com>
 Michael Buesch <m@bues.ch>
 Michel Dänzer <michel@tungstengraphics.com>
@@ -122,6 +123,7 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org>
 Sascha Hauer <s.hauer@pengutronix.de>
 S.Çağlar Onur <caglar@pardus.org.tr>
 Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
+Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> <shuah.khan@hp.com> <shuahkh@osg.samsung.com> <shuah.kh@samsung.com>
 Simon Kelley <simon@thekelleys.org.uk>
 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
 Stephen Hemminger <shemminger@osdl.org>
diff --git a/CREDITS b/CREDITS
index 0f0bf22afe0c..2a3fbcd229e6 100644
--- a/CREDITS
+++ b/CREDITS
@@ -649,6 +649,7 @@ D: Configure, Menuconfig, xconfig
 
 N: Mauro Carvalho Chehab
 E: m.chehab@samsung.org
+E: mchehab@osg.samsung.com
 E: mchehab@infradead.org
 D: Media subsystem (V4L/DVB) drivers and core
 D: EDAC drivers and EDAC 3.0 core rework
diff --git a/Documentation/ABI/testing/configfs-usb-gadget-uvc b/Documentation/ABI/testing/configfs-usb-gadget-uvc
index 2f4a0051b32d..1ba0d0fda9c0 100644
--- a/Documentation/ABI/testing/configfs-usb-gadget-uvc
+++ b/Documentation/ABI/testing/configfs-usb-gadget-uvc
@@ -1,6 +1,6 @@
 What:           /config/usb-gadget/gadget/functions/uvc.name
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    UVC function directory
 
                 streaming_maxburst      - 0..15 (ss only)
@@ -9,37 +9,37 @@ Description:	UVC function directory
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Control descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/class
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Class descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/class/ss
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Super speed control class descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/class/fs
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Full speed control class descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/terminal
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Terminal descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/terminal/output
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Output terminal descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/terminal/output/default
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Default output terminal descriptors
 
                 All attributes read only:
@@ -53,12 +53,12 @@ Description:	Default output terminal descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Camera terminal descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera/default
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Default camera terminal descriptors
 
                 All attributes read only:
@@ -75,12 +75,12 @@ Description:	Default camera terminal descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/processing
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Processing unit descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/processing/default
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Default processing unit descriptors
 
                 All attributes read only:
@@ -94,49 +94,49 @@ Description:	Default processing unit descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/header
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Control header descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/control/header/name
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Specific control header descriptors
 
 dwClockFrequency
 bcdUVC
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Streaming descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/class
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Streaming class descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/class/ss
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Super speed streaming class descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/class/hs
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    High speed streaming class descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/class/fs
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Full speed streaming class descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Color matching descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/default
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Default color matching descriptors
 
                 All attributes read only:
@@ -150,12 +150,12 @@ Description:	Default color matching descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    MJPEG format descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Specific MJPEG format descriptors
 
                 All attributes read only,
@@ -174,7 +174,7 @@ Description:	Specific MJPEG format descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name/name
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Specific MJPEG frame descriptors
 
                 dwFrameInterval         - indicates how frame interval can be
@@ -196,12 +196,12 @@ Description:	Specific MJPEG frame descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Uncompressed format descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Specific uncompressed format descriptors
 
                 bmaControls             - this format's data for bmaControls in
@@ -221,7 +221,7 @@ Description:	Specific uncompressed format descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name/name
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Specific uncompressed frame descriptors
 
                 dwFrameInterval         - indicates how frame interval can be
@@ -243,12 +243,12 @@ Description:	Specific uncompressed frame descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/header
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Streaming header descriptors
 
 What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/header/name
 Date:           Dec 2014
-KernelVersion:  3.20
+KernelVersion:  4.0
 Description:    Specific streaming header descriptors
 
                 All attributes read only:
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935 b/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
index 6708c5e264aa..33e96f740639 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
+++ b/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
@@ -1,4 +1,4 @@
-What            /sys/bus/iio/devices/iio:deviceX/in_proximity_raw
+What            /sys/bus/iio/devices/iio:deviceX/in_proximity_input
 Date:           March 2014
 KernelVersion:  3.15
 Contact:        Matt Ranostay <mranostay@gmail.com>
diff --git a/Documentation/leds/leds-class.txt b/Documentation/leds/leds-class.txt
index d406d98339b2..44f5e6bccd97 100644
--- a/Documentation/leds/leds-class.txt
+++ b/Documentation/leds/leds-class.txt
@@ -74,8 +74,8 @@ blink_set() function (see <linux/leds.h>). To set an LED to blinking,
 however, it is better to use the API function led_blink_set(), as it
 will check and implement software fallback if necessary.
 
-To turn off blinking again, use the API function led_brightness_set()
-as that will not just set the LED brightness but also stop any software
+To turn off blinking, use the API function led_brightness_set()
+with brightness value LED_OFF, which should stop any software
 timers that may have been required for blinking.
 
 The blink_set() function should choose a user friendly blinking value
diff --git a/MAINTAINERS b/MAINTAINERS
index dff697ca7155..98f8a5c92314 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2243,7 +2243,8 @@ F:	include/net/ax25.h
 F:      net/ax25/
 
 AZ6007 DVB DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -2710,7 +2711,8 @@ F:	Documentation/filesystems/btrfs.txt
 F:      fs/btrfs/
 
 BTTV VIDEO4LINUX DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -3345,7 +3347,8 @@ S:	Maintained
 F:      drivers/media/dvb-frontends/cx24120*
 
 CX88 VIDEO4LINUX DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -4292,7 +4295,8 @@ F:	fs/ecryptfs/
 EDAC-CORE
 M:      Doug Thompson <dougthompson@xmission.com>
 M:      Borislav Petkov <bp@alien8.de>
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-edac@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
@@ -4337,7 +4341,8 @@ S:	Maintained
 F:      drivers/edac/e7xxx_edac.c
 
 EDAC-GHES
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-edac@vger.kernel.org
 S:      Maintained
 F:      drivers/edac/ghes_edac.c
@@ -4361,19 +4366,22 @@ S:	Maintained
 F:      drivers/edac/i5000_edac.c
 
 EDAC-I5400
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-edac@vger.kernel.org
 S:      Maintained
 F:      drivers/edac/i5400_edac.c
 
 EDAC-I7300
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-edac@vger.kernel.org
 S:      Maintained
 F:      drivers/edac/i7300_edac.c
 
 EDAC-I7CORE
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-edac@vger.kernel.org
 S:      Maintained
 F:      drivers/edac/i7core_edac.c
@@ -4410,7 +4418,8 @@ S:	Maintained
 F:      drivers/edac/r82600_edac.c
 
 EDAC-SBRIDGE
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-edac@vger.kernel.org
 S:      Maintained
 F:      drivers/edac/sb_edac.c
@@ -4469,7 +4478,8 @@ S:	Maintained
 F:      drivers/net/ethernet/ibm/ehea/
 
 EM28XX VIDEO4LINUX DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -6488,6 +6498,7 @@ F:	include/uapi/linux/sunrpc/
 
 KERNEL SELFTEST FRAMEWORK
 M:      Shuah Khan <shuahkh@osg.samsung.com>
+M:      Shuah Khan <shuah@kernel.org>
 L:      linux-kselftest@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/shuah/linux-kselftest
 S:      Maintained
@@ -7359,7 +7370,8 @@ S:	Supported
 F:      drivers/media/pci/netup_unidvb/*
 
 MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 P:      LinuxTV.org Project
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
@@ -9853,7 +9865,8 @@ S:	Odd Fixes
 F:      drivers/media/i2c/saa6588*
 
 SAA7134 VIDEO4LINUX DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -10372,7 +10385,8 @@ S:	Maintained
 F:      drivers/media/radio/si4713/radio-usb-si4713.c
 
 SIANO DVB DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -11138,7 +11152,8 @@ S:	Maintained
 F:      drivers/media/i2c/tda9840*
 
 TEA5761 TUNER DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -11146,7 +11161,8 @@ S:	Odd fixes
 F:      drivers/media/tuners/tea5761.*
 
 TEA5767 TUNER DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -11533,7 +11549,8 @@ F:	include/linux/shmem_fs.h
 F:      mm/shmem.c
 
 TM6000 VIDEO4LINUX DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
@@ -11887,7 +11904,8 @@ F:	drivers/usb/common/usb-otg-fsm.c
 
 USB OVER IP DRIVER
 M:      Valentina Manea <valentina.manea.m@gmail.com>
-M:      Shuah Khan <shuah.kh@samsung.com>
+M:      Shuah Khan <shuahkh@osg.samsung.com>
+M:      Shuah Khan <shuah@kernel.org>
 L:      linux-usb@vger.kernel.org
 S:      Maintained
 F:      Documentation/usb/usbip_protocol.txt
@@ -11958,6 +11976,7 @@ L:	linux-usb@vger.kernel.org
 W:      http://www.linux-usb.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
 S:      Supported
+F:      Documentation/devicetree/bindings/usb/
 F:      Documentation/usb/
 F:      drivers/usb/
 F:      include/linux/usb.h
@@ -12131,6 +12150,7 @@ VIRTIO CORE, NET AND BLOCK DRIVERS
 M:      "Michael S. Tsirkin" <mst@redhat.com>
 L:      virtualization@lists.linux-foundation.org
 S:      Maintained
+F:      Documentation/devicetree/bindings/virtio/
 F:      drivers/virtio/
 F:      tools/virtio/
 F:      drivers/net/virtio_net.c
@@ -12519,7 +12539,8 @@ S:	Maintained
 F:      arch/x86/entry/vdso/
 
 XC2028/3028 TUNER DRIVER
-M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+M:      Mauro Carvalho Chehab <mchehab@s-opensource.com>
+M:      Mauro Carvalho Chehab <mchehab@kernel.org>
 L:      linux-media@vger.kernel.org
 W:      https://linuxtv.org
 T:      git git://linuxtv.org/media_tree.git
diff --git a/arch/Kconfig b/arch/Kconfig
index d794384a0404..e9734796531f 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -606,6 +606,9 @@ config HAVE_ARCH_HASH
           file which provides platform-specific implementations of some
           functions in <linux/hash.h> or fs/namei.c.
 
+config ISA_BUS_API
+        def_bool ISA
+
 #
 # ABI hall of shame
 #
diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
index aeddd28b3595..92fd2c8a9af0 100644
--- a/arch/arm/include/asm/pgtable-2level.h
+++ b/arch/arm/include/asm/pgtable-2level.h
@@ -193,6 +193,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr)
 
 #define pmd_large(pmd)          (pmd_val(pmd) & 2)
 #define pmd_bad(pmd)            (pmd_val(pmd) & 2)
+#define pmd_present(pmd)        (pmd_val(pmd))
 
 #define copy_pmd(pmdpd,pmdps)           \
         do {                            \
diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
index fa70db7c714b..2a029bceaf2f 100644
--- a/arch/arm/include/asm/pgtable-3level.h
+++ b/arch/arm/include/asm/pgtable-3level.h
@@ -211,6 +211,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr)
                                                 : !!(pmd_val(pmd) & (val)))
 #define pmd_isclear(pmd, val)   (!(pmd_val(pmd) & (val)))
 
+#define pmd_present(pmd)        (pmd_isset((pmd), L_PMD_SECT_VALID))
 #define pmd_young(pmd)          (pmd_isset((pmd), PMD_SECT_AF))
 #define pte_special(pte)        (pte_isset((pte), L_PTE_SPECIAL))
 static inline pte_t pte_mkspecial(pte_t pte)
@@ -249,10 +250,10 @@ PMD_BIT_FUNC(mkyoung,   |= PMD_SECT_AF);
 #define pfn_pmd(pfn,prot)       (__pmd(((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot)))
 #define mk_pmd(page,prot)       pfn_pmd(page_to_pfn(page),prot)
 
-/* represent a notpresent pmd by zero, this is used by pmdp_invalidate */
+/* represent a notpresent pmd by faulting entry, this is used by pmdp_invalidate */
 static inline pmd_t pmd_mknotpresent(pmd_t pmd)
 {
-        return __pmd(0);
+        return __pmd(pmd_val(pmd) & ~L_PMD_SECT_VALID);
 }
 
 static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index 348caabb7625..d62204060cbe 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -182,7 +182,6 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
 #define pgd_offset_k(addr)      pgd_offset(&init_mm, addr)
 
 #define pmd_none(pmd)           (!pmd_val(pmd))
-#define pmd_present(pmd)        (pmd_val(pmd))
 
 static inline pte_t *pmd_page_vaddr(pmd_t pmd)
 {
diff --git a/arch/arm64/include/asm/kgdb.h b/arch/arm64/include/asm/kgdb.h
index f69f69c8120c..da84645525b9 100644
--- a/arch/arm64/include/asm/kgdb.h
+++ b/arch/arm64/include/asm/kgdb.h
@@ -38,25 +38,54 @@ extern int kgdb_fault_expected;
 #endif /* !__ASSEMBLY__ */
 
 /*
- * gdb is expecting the following registers layout.
+ * gdb remote procotol (well most versions of it) expects the following
+ * register layout.
  *
  * General purpose regs:
  *     r0-r30: 64 bit
  *     sp,pc : 64 bit
- *     pstate  : 64 bit
- *     Total: 34
+ *     pstate  : 32 bit
+ *     Total: 33 + 1
  * FPU regs:
  *     f0-f31: 128 bit
- *     Total: 32
- * Extra regs
  *     fpsr & fpcr: 32 bit
- *     Total: 2
+ *     Total: 32 + 2
  *
+ * To expand a little on the "most versions of it"... when the gdb remote
+ * protocol for AArch64 was developed it depended on a statement in the
+ * Architecture Reference Manual that claimed "SPSR_ELx is a 32-bit register".
+ * and, as a result, allocated only 32-bits for the PSTATE in the remote
+ * protocol. In fact this statement is still present in ARM DDI 0487A.i.
+ *
+ * Unfortunately "is a 32-bit register" has a very special meaning for
+ * system registers. It means that "the upper bits, bits[63:32], are
+ * RES0.". RES0 is heavily used in the ARM architecture documents as a
+ * way to leave space for future architecture changes. So to translate a
+ * little for people who don't spend their spare time reading ARM architecture
+ * manuals, what "is a 32-bit register" actually means in this context is
+ * "is a 64-bit register but one with no meaning allocated to any of the
+ * upper 32-bits... *yet*".
+ *
+ * Perhaps then we should not be surprised that this has led to some
+ * confusion. Specifically a patch, influenced by the above translation,
+ * that extended PSTATE to 64-bit was accepted into gdb-7.7 but the patch
+ * was reverted in gdb-7.8.1 and all later releases, when this was
+ * discovered to be an undocumented protocol change.
+ *
+ * So... it is *not* wrong for us to only allocate 32-bits to PSTATE
+ * here even though the kernel itself allocates 64-bits for the same
+ * state. That is because this bit of code tells the kernel how the gdb
+ * remote protocol (well most versions of it) describes the register state.
+ *
+ * Note that if you are using one of the versions of gdb that supports
+ * the gdb-7.7 version of the protocol you cannot use kgdb directly
+ * without providing a custom register description (gdb can load new
+ * protocol descriptions at runtime).
  */
 
-#define _GP_REGS                34
+#define _GP_REGS                33
 #define _FP_REGS                32
-#define _EXTRA_REGS             2
+#define _EXTRA_REGS             3
 /*
  * general purpose registers size in bytes.
  * pstate is only 4 bytes. subtract 4 bytes
diff --git a/arch/arm64/include/asm/spinlock.h b/arch/arm64/include/asm/spinlock.h
index fc9682bfe002..e875a5a551d7 100644
--- a/arch/arm64/include/asm/spinlock.h
+++ b/arch/arm64/include/asm/spinlock.h
@@ -30,22 +30,53 @@ static inline void arch_spin_unlock_wait(arch_spinlock_t *lock)
 {
         unsigned int tmp;
         arch_spinlock_t lockval;
+        u32 owner;
+
+        /*
+         * Ensure prior spin_lock operations to other locks have completed
+         * on this CPU before we test whether "lock" is locked.
+         */
+        smp_mb();
+        owner = READ_ONCE(lock->owner) << 16;
 
         asm volatile(
 "       sevl\n"
 "1:     wfe\n"
 "2:     ldaxr   %w0, %2\n"
+        /* Is the lock free? */
 "       eor     %w1, %w0, %w0, ror #16\n"
-"       cbnz    %w1, 1b\n"
+"       cbz     %w1, 3f\n"
+        /* Lock taken -- has there been a subsequent unlock->lock transition? */
+"       eor     %w1, %w3, %w0, lsl #16\n"
+"       cbz     %w1, 1b\n"
+        /*
+         * The owner has been updated, so there was an unlock->lock
+         * transition that we missed. That means we can rely on the
+         * store-release of the unlock operation paired with the
+         * load-acquire of the lock operation to publish any of our
+         * previous stores to the new lock owner and therefore don't
+         * need to bother with the writeback below.
+         */
+"       b       4f\n"
+"3:\n"
+        /*
+         * Serialise against any concurrent lockers by writing back the
+         * unlocked lock value
+         */
         ARM64_LSE_ATOMIC_INSN(
         /* LL/SC */
 "       stxr    %w1, %w0, %2\n"
-"       cbnz    %w1, 2b\n", /* Serialise against any concurrent lockers */
-        /* LSE atomics */
 "       nop\n"
-"       nop\n")
+"       nop\n",
+        /* LSE atomics */
+"       mov     %w1, %w0\n"
+"       cas     %w0, %w0, %2\n"
+"       eor     %w1, %w1, %w0\n")
+        /* Somebody else wrote to the lock, GOTO 10 and reload the value */
+"       cbnz    %w1, 2b\n"
+"4:"
         : "=&r" (lockval), "=&r" (tmp), "+Q" (*lock)
-        :
+        : "r" (owner)
         : "memory");
 }
 
@@ -148,6 +179,7 @@ static inline int arch_spin_value_unlocked(arch_spinlock_t lock)
 
 static inline int arch_spin_is_locked(arch_spinlock_t *lock)
 {
+        smp_mb(); /* See arch_spin_unlock_wait */
         return !arch_spin_value_unlocked(READ_ONCE(*lock));
 }
 
diff --git a/arch/arm64/kernel/kgdb.c b/arch/arm64/kernel/kgdb.c
index b67531a13136..b5f063e5eff7 100644
--- a/arch/arm64/kernel/kgdb.c
+++ b/arch/arm64/kernel/kgdb.c
@@ -58,7 +58,17 @@ struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] = {
         { "x30", 8, offsetof(struct pt_regs, regs[30])},
         { "sp", 8, offsetof(struct pt_regs, sp)},
         { "pc", 8, offsetof(struct pt_regs, pc)},
-        { "pstate", 8, offsetof(struct pt_regs, pstate)},
+        /*
+         * struct pt_regs thinks PSTATE is 64-bits wide but gdb remote
+         * protocol disagrees. Therefore we must extract only the lower
+         * 32-bits. Look for the big comment in asm/kgdb.h for more
+         * detail.
+         */
+        { "pstate", 4, offsetof(struct pt_regs, pstate)
+#ifdef CONFIG_CPU_BIG_ENDIAN
+                                                        + 4
+#endif
+        },
         { "v0", 16, -1 },
         { "v1", 16, -1 },
         { "v2", 16, -1 },
@@ -128,6 +138,8 @@ sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *task)
         memset((char *)gdb_regs, 0, NUMREGBYTES);
         thread_regs = task_pt_regs(task);
         memcpy((void *)gdb_regs, (void *)thread_regs->regs, GP_REG_BYTES);
+        /* Special case for PSTATE (check comments in asm/kgdb.h for details) */
+        dbg_get_reg(33, gdb_regs + GP_REG_BYTES, thread_regs);
 }
 
 void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long pc)
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index f7cf463107df..2a43012616b7 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -64,8 +64,7 @@ static void dump_mem(const char *lvl, const char *str, unsigned long bottom,
 
         /*
          * We need to switch to kernel mode so that we can use __get_user
-         * to safely read from kernel space.  Note that we now dump the
-         * code first, just in case the backtrace kills us.
+         * to safely read from kernel space.
          */
         fs = get_fs();
         set_fs(KERNEL_DS);
@@ -111,21 +110,12 @@ static void dump_backtrace_entry(unsigned long where)
         print_ip_sym(where);
 }
 
-static void dump_instr(const char *lvl, struct pt_regs *regs)
+static void __dump_instr(const char *lvl, struct pt_regs *regs)
 {
         unsigned long addr = instruction_pointer(regs);
-        mm_segment_t fs;
         char str[sizeof("00000000 ") * 5 + 2 + 1], *p = str;
         int i;
 
-        /*
-         * We need to switch to kernel mode so that we can use __get_user
-         * to safely read from kernel space.  Note that we now dump the
-         * code first, just in case the backtrace kills us.
-         */
-        fs = get_fs();
-        set_fs(KERNEL_DS);
-
         for (i = -4; i < 1; i++) {
                 unsigned int val, bad;
 
@@ -139,8 +129,18 @@ static void dump_instr(const char *lvl, struct pt_regs *regs)
                 }
         }
         printk("%sCode: %s\n", lvl, str);
+}
 
-        set_fs(fs);
+static void dump_instr(const char *lvl, struct pt_regs *regs)
+{
+        if (!user_mode(regs)) {
+                mm_segment_t fs = get_fs();
+                set_fs(KERNEL_DS);
+                __dump_instr(lvl, regs);
+                set_fs(fs);
+        } else {
+                __dump_instr(lvl, regs);
+        }
 }
 
 static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index ba3fc12bd272..013e2cbe7924 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -441,7 +441,7 @@ static int do_bad(unsigned long addr, unsigned int esr, struct pt_regs *regs)
         return 1;
 }
 
-static struct fault_info {
+static const struct fault_info {
         int     (*fn)(unsigned long addr, unsigned int esr, struct pt_regs *regs);
         int     sig;
         int     code;
diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
index 6733ac575da4..36a391d289aa 100644
--- a/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@ -74,7 +74,7 @@
 #define KVM_GUEST_KUSEG                 0x00000000UL
 #define KVM_GUEST_KSEG0                 0x40000000UL
 #define KVM_GUEST_KSEG23                0x60000000UL
-#define KVM_GUEST_KSEGX(a)              ((_ACAST32_(a)) & 0x60000000)
+#define KVM_GUEST_KSEGX(a)              ((_ACAST32_(a)) & 0xe0000000)
 #define KVM_GUEST_CPHYSADDR(a)          ((_ACAST32_(a)) & 0x1fffffff)
 
 #define KVM_GUEST_CKSEG0ADDR(a)         (KVM_GUEST_CPHYSADDR(a) | KVM_GUEST_KSEG0)
@@ -338,6 +338,7 @@ struct kvm_mips_tlb {
 #define KVM_MIPS_GUEST_TLB_SIZE 64
 struct kvm_vcpu_arch {
         void *host_ebase, *guest_ebase;
+        int (*vcpu_run)(struct kvm_run *run, struct kvm_vcpu *vcpu);
         unsigned long host_stack;
         unsigned long host_gp;
 
diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
index 396df6eb0a12..645c8a1982a7 100644
--- a/arch/mips/kvm/emulate.c
+++ b/arch/mips/kvm/emulate.c
@@ -1636,6 +1636,7 @@ enum emulation_result kvm_mips_emulate_cache(uint32_t inst, uint32_t *opc,
                 if (index < 0) {
                         vcpu->arch.host_cp0_entryhi = (va & VPN2_MASK);
                         vcpu->arch.host_cp0_badvaddr = va;
+                        vcpu->arch.pc = curr_pc;
                         er = kvm_mips_emulate_tlbmiss_ld(cause, NULL, run,
                                                          vcpu);
                         preempt_enable();
@@ -1647,6 +1648,8 @@ enum emulation_result kvm_mips_emulate_cache(uint32_t inst, uint32_t *opc,
                          * invalid exception to the guest
                          */
                         if (!TLB_IS_VALID(*tlb, va)) {
+                                vcpu->arch.host_cp0_badvaddr = va;
+                                vcpu->arch.pc = curr_pc;
                                 er = kvm_mips_emulate_tlbinv_ld(cause, NULL,
                                                                 run, vcpu);
                                 preempt_enable();
@@ -1666,7 +1669,7 @@ enum emulation_result kvm_mips_emulate_cache(uint32_t inst, uint32_t *opc,
                         cache, op, base, arch->gprs[base], offset);
                 er = EMULATE_FAIL;
                 preempt_enable();
-                goto dont_update_pc;
+                goto done;
 
         }
 
@@ -1694,16 +1697,20 @@ skip_fault:
                 kvm_err("NO-OP CACHE (cache: %#x, op: %#x, base[%d]: %#lx, offset: %#x\n",
                         cache, op, base, arch->gprs[base], offset);
                 er = EMULATE_FAIL;
-                preempt_enable();
-                goto dont_update_pc;
         }
 
         preempt_enable();
+done:
+        /* Rollback PC only if emulation was unsuccessful */
+        if (er == EMULATE_FAIL)
+                vcpu->arch.pc = curr_pc;
 
 dont_update_pc:
-        /* Rollback PC */
-        vcpu->arch.pc = curr_pc;
-done:
+        /*
+         * This is for exceptions whose emulation updates the PC, so do not
+         * overwrite the PC under any circumstances
+         */
+
         return er;
 }
 
diff --git a/arch/mips/kvm/interrupt.h b/arch/mips/kvm/interrupt.h
index 4ab4bdfad703..2143884709e4 100644
--- a/arch/mips/kvm/interrupt.h
+++ b/arch/mips/kvm/interrupt.h
@@ -28,6 +28,7 @@
 #define MIPS_EXC_MAX                12
 /* XXXSL More to follow */
 
+extern char __kvm_mips_vcpu_run_end[];
 extern char mips32_exception[], mips32_exceptionEnd[];
 extern char mips32_GuestException[], mips32_GuestExceptionEnd[];
 
diff --git a/arch/mips/kvm/locore.S b/arch/mips/kvm/locore.S
index 3ef03009de5f..828fcfc1cd7f 100644
--- a/arch/mips/kvm/locore.S
+++ b/arch/mips/kvm/locore.S
@@ -202,6 +202,7 @@ FEXPORT(__kvm_mips_load_k0k1)
 
         /* Jump to guest */
         eret
+EXPORT(__kvm_mips_vcpu_run_end)
 
 VECTOR(MIPSX(exception), unknown)
 /* Find out what mode we came from and jump to the proper handler. */
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index dc052fb5c7a2..44da5259f390 100644
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -315,6 +315,15 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)
         memcpy(gebase + offset, mips32_GuestException,
                mips32_GuestExceptionEnd - mips32_GuestException);
 
+#ifdef MODULE
+        offset += mips32_GuestExceptionEnd - mips32_GuestException;
+        memcpy(gebase + offset, (char *)__kvm_mips_vcpu_run,
+               __kvm_mips_vcpu_run_end - (char *)__kvm_mips_vcpu_run);
+        vcpu->arch.vcpu_run = gebase + offset;
+#else
+        vcpu->arch.vcpu_run = __kvm_mips_vcpu_run;
+#endif
+
         /* Invalidate the icache for these ranges */
         local_flush_icache_range((unsigned long)gebase,
                                 (unsigned long)gebase + ALIGN(size, PAGE_SIZE));
@@ -404,7 +413,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
         /* Disable hardware page table walking while in guest */
         htw_stop();
 
-        r = __kvm_mips_vcpu_run(run, vcpu);
+        r = vcpu->arch.vcpu_run(run, vcpu);
 
         /* Re-enable HTW before enabling interrupts */
         htw_start();
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index 37b9017c6a96..ac82e8eb936d 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -245,6 +245,7 @@ struct kvm_vcpu_stat {
         u32 exit_stop_request;
         u32 exit_validity;
         u32 exit_instruction;
+        u32 exit_pei;
         u32 halt_successful_poll;
         u32 halt_attempted_poll;
         u32 halt_poll_invalid;
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index 2e6b54e4d3f9..252157181302 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -341,6 +341,8 @@ static int handle_mvpg_pei(struct kvm_vcpu *vcpu)
 
 static int handle_partial_execution(struct kvm_vcpu *vcpu)
 {
+        vcpu->stat.exit_pei++;
+
         if (vcpu->arch.sie_block->ipa == 0xb254)        /* MVPG */
                 return handle_mvpg_pei(vcpu);
         if (vcpu->arch.sie_block->ipa >> 8 == 0xae)     /* SIGP */
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 6d8ec3ac9dd8..43f2a2b80490 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -61,6 +61,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
         { "exit_external_request", VCPU_STAT(exit_external_request) },
         { "exit_external_interrupt", VCPU_STAT(exit_external_interrupt) },
         { "exit_instruction", VCPU_STAT(exit_instruction) },
+        { "exit_pei", VCPU_STAT(exit_pei) },
         { "exit_program_interruption", VCPU_STAT(exit_program_interruption) },
         { "exit_instr_and_program_int", VCPU_STAT(exit_instr_and_program) },
         { "halt_successful_poll", VCPU_STAT(halt_successful_poll) },
@@ -657,7 +658,7 @@ static int kvm_s390_set_processor(struct kvm *kvm, struct kvm_device_attr *attr)
                 kvm->arch.model.cpuid = proc->cpuid;
                 lowest_ibc = sclp.ibc >> 16 & 0xfff;
                 unblocked_ibc = sclp.ibc & 0xfff;
-                if (lowest_ibc) {
+                if (lowest_ibc && proc->ibc) {
                         if (proc->ibc > unblocked_ibc)
                                 kvm->arch.model.ibc = unblocked_ibc;
                         else if (proc->ibc < lowest_ibc)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0a7b885964ba..d9a94da0c29f 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2439,6 +2439,15 @@ config PCI_CNB20LE_QUIRK
 
 source "drivers/pci/Kconfig"
 
+config ISA_BUS
+        bool "ISA-style bus support on modern systems" if EXPERT
+        select ISA_BUS_API
+        help
+          Enables ISA-style drivers on modern systems. This is necessary to
+          support PC/104 devices on X86_64 platforms.
+
+          If unsure, say N.
+
 # x86_64 have no ISA slots, but can have ISA-style DMA.
 config ISA_DMA_API
         bool "ISA-style DMA support" if (X86_64 && EXPERT)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index e0fbe7e70dc1..69e62862b622 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -27,6 +27,7 @@
 #include <linux/irqbypass.h>
 #include <linux/hyperv.h>
 
+#include <asm/apic.h>
 #include <asm/pvclock-abi.h>
 #include <asm/desc.h>
 #include <asm/mtrr.h>
@@ -1368,4 +1369,14 @@ static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu)
 
 static inline void kvm_arch_vcpu_block_finish(struct kvm_vcpu *vcpu) {}
 
+static inline int kvm_cpu_get_apicid(int mps_cpu)
+{
+#ifdef CONFIG_X86_LOCAL_APIC
+        return __default_cpu_present_to_apicid(mps_cpu);
+#else
+        WARN_ON_ONCE(1);
+        return BAD_APICID;
+#endif
+}
+
 #endif /* _ASM_X86_KVM_HOST_H */
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 1163e8173e5a..16ef31b87452 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -238,7 +238,9 @@ module_param(nested, int, S_IRUGO);
 
 /* enable / disable AVIC */
 static int avic;
+#ifdef CONFIG_X86_LOCAL_APIC
 module_param(avic, int, S_IRUGO);
+#endif
 
 static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0);
 static void svm_flush_tlb(struct kvm_vcpu *vcpu);
@@ -981,11 +983,14 @@ static __init int svm_hardware_setup(void)
         } else
                 kvm_disable_tdp();
 
-        if (avic && (!npt_enabled || !boot_cpu_has(X86_FEATURE_AVIC)))
-                avic = false;
-
-        if (avic)
-                pr_info("AVIC enabled\n");
+        if (avic) {
+                if (!npt_enabled ||
+                    !boot_cpu_has(X86_FEATURE_AVIC) ||
+                    !IS_ENABLED(CONFIG_X86_LOCAL_APIC))
+                        avic = false;
+                else
+                        pr_info("AVIC enabled\n");
+        }
 
         return 0;
 
@@ -1324,7 +1329,7 @@ free_avic:
 static void avic_set_running(struct kvm_vcpu *vcpu, bool is_run)
 {
         u64 entry;
-        int h_physical_id = __default_cpu_present_to_apicid(vcpu->cpu);
+        int h_physical_id = kvm_cpu_get_apicid(vcpu->cpu);
         struct vcpu_svm *svm = to_svm(vcpu);
 
         if (!kvm_vcpu_apicv_active(vcpu))
@@ -1349,7 +1354,7 @@ static void avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 {
         u64 entry;
         /* ID = 0xff (broadcast), ID > 0xff (reserved) */
-        int h_physical_id = __default_cpu_present_to_apicid(cpu);
+        int h_physical_id = kvm_cpu_get_apicid(cpu);
         struct vcpu_svm *svm = to_svm(vcpu);
 
         if (!kvm_vcpu_apicv_active(vcpu))
@@ -4236,7 +4241,7 @@ static void svm_deliver_avic_intr(struct kvm_vcpu *vcpu, int vec)
 
         if (avic_vcpu_is_running(vcpu))
                 wrmsrl(SVM_AVIC_DOORBELL,
-                       __default_cpu_present_to_apicid(vcpu->cpu));
+                       kvm_cpu_get_apicid(vcpu->cpu));
         else
                 kvm_vcpu_wake_up(vcpu);
 }
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index fb93010beaa4..003618e324ce 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2072,7 +2072,8 @@ static void vmx_vcpu_pi_load(struct kvm_vcpu *vcpu, int cpu)
         unsigned int dest;
 
         if (!kvm_arch_has_assigned_device(vcpu->kvm) ||
-                !irq_remapping_cap(IRQ_POSTING_CAP))
+                !irq_remapping_cap(IRQ_POSTING_CAP)  ||
+                !kvm_vcpu_apicv_active(vcpu))
                 return;
 
         do {
@@ -2180,7 +2181,8 @@ static void vmx_vcpu_pi_put(struct kvm_vcpu *vcpu)
         struct pi_desc *pi_desc = vcpu_to_pi_desc(vcpu);
 
         if (!kvm_arch_has_assigned_device(vcpu->kvm) ||
-                !irq_remapping_cap(IRQ_POSTING_CAP))
+                !irq_remapping_cap(IRQ_POSTING_CAP)  ||
+                !kvm_vcpu_apicv_active(vcpu))
                 return;
 
         /* Set SN when the vCPU is preempted */
@@ -10714,7 +10716,8 @@ static int vmx_pre_block(struct kvm_vcpu *vcpu)
         struct pi_desc *pi_desc = vcpu_to_pi_desc(vcpu);
 
         if (!kvm_arch_has_assigned_device(vcpu->kvm) ||
-                !irq_remapping_cap(IRQ_POSTING_CAP))
+                !irq_remapping_cap(IRQ_POSTING_CAP)  ||
+                !kvm_vcpu_apicv_active(vcpu))
                 return 0;
 
         vcpu->pre_pcpu = vcpu->cpu;
@@ -10780,7 +10783,8 @@ static void vmx_post_block(struct kvm_vcpu *vcpu)
         unsigned long flags;
 
         if (!kvm_arch_has_assigned_device(vcpu->kvm) ||
-                !irq_remapping_cap(IRQ_POSTING_CAP))
+                !irq_remapping_cap(IRQ_POSTING_CAP)  ||
+                !kvm_vcpu_apicv_active(vcpu))
                 return;
 
         do {
@@ -10833,7 +10837,8 @@ static int vmx_update_pi_irte(struct kvm *kvm, unsigned int host_irq,
         int idx, ret = -EINVAL;
 
         if (!kvm_arch_has_assigned_device(kvm) ||
-                !irq_remapping_cap(IRQ_POSTING_CAP))
+                !irq_remapping_cap(IRQ_POSTING_CAP) ||
+                !kvm_vcpu_apicv_active(kvm->vcpus[0]))
                 return 0;
 
         idx = srcu_read_lock(&kvm->irq_srcu);
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index daceb80022b0..3b7fb99362b6 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -306,12 +306,6 @@ acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
 acpi_status acpi_hw_write(u32 value, struct acpi_generic_address *reg)
 {
         u64 address;
-        u8 access_width;
-        u32 bit_width;
-        u8 bit_offset;
-        u64 value64;
-        u32 new_value32, old_value32;
-        u8 index;
         acpi_status status;
 
         ACPI_FUNCTION_NAME(hw_write);
@@ -323,145 +317,23 @@ acpi_status acpi_hw_write(u32 value, struct acpi_generic_address *reg)
                 return (status);
         }
 
-        /* Convert access_width into number of bits based */
-
-        access_width = acpi_hw_get_access_bit_width(reg, 32);
-        bit_width = reg->bit_offset + reg->bit_width;
-        bit_offset = reg->bit_offset;
-
         /*
          * Two address spaces supported: Memory or IO. PCI_Config is
          * not supported here because the GAS structure is insufficient
          */
-        index = 0;
-        while (bit_width) {
-                /*
-                 * Use offset style bit reads because "Index * AccessWidth" is
-                 * ensured to be less than 32-bits by acpi_hw_validate_register().
-                 */
-                new_value32 = ACPI_GET_BITS(&value, index * access_width,
-                                            ACPI_MASK_BITS_ABOVE_32
-                                            (access_width));
-
-                if (bit_offset >= access_width) {
-                        bit_offset -= access_width;
-                } else {
-                        /*
-                         * Use offset style bit masks because access_width is ensured
-                         * to be less than 32-bits by acpi_hw_validate_register() and
-                         * bit_offset/bit_width is less than access_width here.
-                         */
-                        if (bit_offset) {
-                                new_value32 &= ACPI_MASK_BITS_BELOW(bit_offset);
-                        }
-                        if (bit_width < access_width) {
-                                new_value32 &= ACPI_MASK_BITS_ABOVE(bit_width);
-                        }
-
-                        if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
-                                if (bit_offset || bit_width < access_width) {
-                                        /*
-                                         * Read old values in order not to modify the bits that
-                                         * are beyond the register bit_width/bit_offset setting.
-                                         */
-                                        status =
-                                            acpi_os_read_memory((acpi_physical_address)
-                                                                address +
-                                                                index *
-                                                                ACPI_DIV_8
-                                                                (access_width),
-                                                                &value64,
-                                                                access_width);
-                                        old_value32 = (u32)value64;
-
-                                        /*
-                                         * Use offset style bit masks because access_width is
-                                         * ensured to be less than 32-bits by
-                                         * acpi_hw_validate_register() and bit_offset/bit_width is
-                                         * less than access_width here.
-                                         */
-                                        if (bit_offset) {
-                                                old_value32 &=
-                                                    ACPI_MASK_BITS_ABOVE
-                                                    (bit_offset);
-                                                bit_offset = 0;
-                                        }
-                                        if (bit_width < access_width) {
-                                                old_value32 &=
-                                                    ACPI_MASK_BITS_BELOW
-                                                    (bit_width);
-                                        }
-
-                                        new_value32 |= old_value32;
-                                }
-
-                                value64 = (u64)new_value32;
-                                status =
-                                    acpi_os_write_memory((acpi_physical_address)
-                                                         address +
-                                                         index *
-                                                         ACPI_DIV_8
-                                                         (access_width),
-                                                         value64, access_width);
-                        } else {        /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
-
-                                if (bit_offset || bit_width < access_width) {
-                                        /*
-                                         * Read old values in order not to modify the bits that
-                                         * are beyond the register bit_width/bit_offset setting.
-                                         */
-                                        status =
-                                            acpi_hw_read_port((acpi_io_address)
-                                                              address +
-                                                              index *
-                                                              ACPI_DIV_8
-                                                              (access_width),
-                                                              &old_value32,
-                                                              access_width);
-
-                                        /*
-                                         * Use offset style bit masks because access_width is
-                                         * ensured to be less than 32-bits by
-                                         * acpi_hw_validate_register() and bit_offset/bit_width is
-                                         * less than access_width here.
-                                         */
-                                        if (bit_offset) {
-                                                old_value32 &=
-                                                    ACPI_MASK_BITS_ABOVE
-                                                    (bit_offset);
-                                                bit_offset = 0;
-                                        }
-                                        if (bit_width < access_width) {
-                                                old_value32 &=
-                                                    ACPI_MASK_BITS_BELOW
-                                                    (bit_width);
-                                        }
-
-                                        new_value32 |= old_value32;
-                                }
-
-                                status = acpi_hw_write_port((acpi_io_address)
-                                                            address +
-                                                            index *
-                                                            ACPI_DIV_8
-                                                            (access_width),
-                                                            new_value32,
-                                                            access_width);
-                        }
-                }
-
-                /*
-                 * Index * access_width is ensured to be less than 32-bits by
-                 * acpi_hw_validate_register().
-                 */
-                bit_width -=
-                    bit_width > access_width ? access_width : bit_width;
-                index++;
+        if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
+                status = acpi_os_write_memory((acpi_physical_address)
+                                              address, (u64)value,
+                                              reg->bit_width);
+        } else {                /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
+
+                status = acpi_hw_write_port((acpi_io_address)
+                                            address, value, reg->bit_width);
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_IO,
                           "Wrote: %8.8X width %2d   to %8.8X%8.8X (%s)\n",
-                          value, access_width, ACPI_FORMAT_UINT64(address),
+                          value, reg->bit_width, ACPI_FORMAT_UINT64(address),
                           acpi_ut_get_region_name(reg->space_id)));
 
         return (status);
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 6b2a84e7f2be..2609ba20b396 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
 obj-y                   += power/
 obj-$(CONFIG_HAS_DMA)   += dma-mapping.o
 obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
-obj-$(CONFIG_ISA)       += isa.o
+obj-$(CONFIG_ISA_BUS_API)       += isa.o
 obj-$(CONFIG_FW_LOADER) += firmware_class.o
 obj-$(CONFIG_NUMA)      += node.o
 obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
diff --git a/drivers/base/isa.c b/drivers/base/isa.c
index 91dba65d7264..cd6ccdcf9df0 100644
--- a/drivers/base/isa.c
+++ b/drivers/base/isa.c
@@ -180,4 +180,4 @@ static int __init isa_bus_init(void)
         return error;
 }
 
-device_initcall(isa_bus_init);
+postcore_initcall(isa_bus_init);
diff --git a/drivers/base/module.c b/drivers/base/module.c
index db930d3ee312..2a215780eda2 100644
--- a/drivers/base/module.c
+++ b/drivers/base/module.c
@@ -24,10 +24,12 @@ static char *make_driver_name(struct device_driver *drv)
 
 static void module_create_drivers_dir(struct module_kobject *mk)
 {
-        if (!mk || mk->drivers_dir)
-                return;
+        static DEFINE_MUTEX(drivers_dir_mutex);
 
-        mk->drivers_dir = kobject_create_and_add("drivers", &mk->kobj);
+        mutex_lock(&drivers_dir_mutex);
+        if (mk && !mk->drivers_dir)
+                mk->drivers_dir = kobject_create_and_add("drivers", &mk->kobj);
+        mutex_unlock(&drivers_dir_mutex);
 }
 
 void module_add_driver(struct module *mod, struct device_driver *drv)
diff --git a/drivers/base/power/opp/cpu.c b/drivers/base/power/opp/cpu.c
index 83d6e7ba1a34..8c3434bdb26d 100644
--- a/drivers/base/power/opp/cpu.c
+++ b/drivers/base/power/opp/cpu.c
@@ -211,7 +211,7 @@ int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev,
                 }
 
                 /* Mark opp-table as multiple CPUs are sharing it now */
-                opp_table->shared_opp = true;
+                opp_table->shared_opp = OPP_TABLE_ACCESS_SHARED;
         }
 unlock:
         mutex_unlock(&opp_table_lock);
@@ -227,7 +227,8 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_set_sharing_cpus);
  *
  * This updates the @cpumask with CPUs that are sharing OPPs with @cpu_dev.
  *
- * Returns -ENODEV if OPP table isn't already present.
+ * Returns -ENODEV if OPP table isn't already present and -EINVAL if the OPP
+ * table's status is access-unknown.
  *
  * Locking: The internal opp_table and opp structures are RCU protected.
  * Hence this function internally uses RCU updater strategy with mutex locks
@@ -249,9 +250,14 @@ int dev_pm_opp_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask)
                 goto unlock;
         }
 
+        if (opp_table->shared_opp == OPP_TABLE_ACCESS_UNKNOWN) {
+                ret = -EINVAL;
+                goto unlock;
+        }
+
         cpumask_clear(cpumask);
 
-        if (opp_table->shared_opp) {
+        if (opp_table->shared_opp == OPP_TABLE_ACCESS_SHARED) {
                 list_for_each_entry(opp_dev, &opp_table->dev_list, node)
                         cpumask_set_cpu(opp_dev->dev->id, cpumask);
         } else {
diff --git a/drivers/base/power/opp/of.c b/drivers/base/power/opp/of.c
index 94d2010558e3..1dfd3dd92624 100644
--- a/drivers/base/power/opp/of.c
+++ b/drivers/base/power/opp/of.c
@@ -34,7 +34,10 @@ static struct opp_table *_managed_opp(const struct device_node *np)
                          * But the OPPs will be considered as shared only if the
                          * OPP table contains a "opp-shared" property.
                          */
-                        return opp_table->shared_opp ? opp_table : NULL;
+                        if (opp_table->shared_opp == OPP_TABLE_ACCESS_SHARED)
+                                return opp_table;
+
+                        return NULL;
                 }
         }
 
@@ -353,7 +356,10 @@ static int _of_add_opp_table_v2(struct device *dev, struct device_node *opp_np)
         }
 
         opp_table->np = opp_np;
-        opp_table->shared_opp = of_property_read_bool(opp_np, "opp-shared");
+        if (of_property_read_bool(opp_np, "opp-shared"))
+                opp_table->shared_opp = OPP_TABLE_ACCESS_SHARED;
+        else
+                opp_table->shared_opp = OPP_TABLE_ACCESS_EXCLUSIVE;
 
         mutex_unlock(&opp_table_lock);
 
diff --git a/drivers/base/power/opp/opp.h b/drivers/base/power/opp/opp.h
index 20f3be22e060..fabd5ca1a083 100644
--- a/drivers/base/power/opp/opp.h
+++ b/drivers/base/power/opp/opp.h
@@ -119,6 +119,12 @@ struct opp_device {
 #endif
 };
 
+enum opp_table_access {
+        OPP_TABLE_ACCESS_UNKNOWN = 0,
+        OPP_TABLE_ACCESS_EXCLUSIVE = 1,
+        OPP_TABLE_ACCESS_SHARED = 2,
+};
+
 /**
  * struct opp_table - Device opp structure
  * @node:       table node - contains the devices with OPPs that
@@ -166,7 +172,7 @@ struct opp_table {
         /* For backward compatibility with v1 bindings */
         unsigned int voltage_tolerance_v1;
 
-        bool shared_opp;
+        enum opp_table_access shared_opp;
         struct dev_pm_opp *suspend_opp;
 
         unsigned int *supported_hw;
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 94fb407d8561..44b1bd6baa38 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -3820,6 +3820,7 @@ static void handle_new_recv_msgs(ipmi_smi_t intf)
         while (!list_empty(&intf->waiting_rcv_msgs)) {
                 smi_msg = list_entry(intf->waiting_rcv_msgs.next,
                                      struct ipmi_smi_msg, link);
+                list_del(&smi_msg->link);
                 if (!run_to_completion)
                         spin_unlock_irqrestore(&intf->waiting_rcv_msgs_lock,
                                                flags);
@@ -3829,11 +3830,14 @@ static void handle_new_recv_msgs(ipmi_smi_t intf)
                 if (rv > 0) {
                         /*
                          * To preserve message order, quit if we
-                         * can't handle a message.
+                         * can't handle a message.  Add the message
+                         * back at the head, this is safe because this
+                         * tasklet is the only thing that pulls the
+                         * messages.
                          */
+                        list_add(&smi_msg->link, &intf->waiting_rcv_msgs);
                         break;
                 } else {
-                        list_del(&smi_msg->link);
                         if (rv == 0)
                                 /* Message handled */
                                 ipmi_free_smi_msg(smi_msg);
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index ee367e9b7d2e..fe9dc17ea873 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -372,26 +372,9 @@ static bool intel_pstate_get_ppc_enable_status(void)
         return acpi_ppc;
 }
 
-/*
- * The max target pstate ratio is a 8 bit value in both PLATFORM_INFO MSR and
- * in TURBO_RATIO_LIMIT MSR, which pstate driver stores in max_pstate and
- * max_turbo_pstate fields. The PERF_CTL MSR contains 16 bit value for P state
- * ratio, out of it only high 8 bits are used. For example 0x1700 is setting
- * target ratio 0x17. The _PSS control value stores in a format which can be
- * directly written to PERF_CTL MSR. But in intel_pstate driver this shift
- * occurs during write to PERF_CTL (E.g. for cores core_set_pstate()).
- * This function converts the _PSS control value to intel pstate driver format
- * for comparison and assignment.
- */
-static int convert_to_native_pstate_format(struct cpudata *cpu, int index)
-{
-        return cpu->acpi_perf_data.states[index].control >> 8;
-}
-
 static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)
 {
         struct cpudata *cpu;
-        int turbo_pss_ctl;
         int ret;
         int i;
 
@@ -441,11 +424,10 @@ static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)
          * max frequency, which will cause a reduced performance as
          * this driver uses real max turbo frequency as the max
          * frequency. So correct this frequency in _PSS table to
-         * correct max turbo frequency based on the turbo ratio.
+         * correct max turbo frequency based on the turbo state.
          * Also need to convert to MHz as _PSS freq is in MHz.
          */
-        turbo_pss_ctl = convert_to_native_pstate_format(cpu, 0);
-        if (turbo_pss_ctl > cpu->pstate.max_pstate)
+        if (!limits->turbo_disabled)
                 cpu->acpi_perf_data.states[0].core_frequency =
                                         policy->cpuinfo.max_freq / 1000;
         cpu->valid_pss_table = true;
diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c
index 8b3226dca1d9..caff46c0e214 100644
--- a/drivers/extcon/extcon-palmas.c
+++ b/drivers/extcon/extcon-palmas.c
@@ -360,6 +360,8 @@ static int palmas_usb_probe(struct platform_device *pdev)
 
         palmas_enable_irq(palmas_usb);
         /* perform initial detection */
+        if (palmas_usb->enable_gpio_vbus_detection)
+                palmas_vbus_irq_handler(palmas_usb->gpio_vbus_irq, palmas_usb);
         palmas_gpio_id_detect(&palmas_usb->wq_detectid.work);
         device_set_wakeup_capable(&pdev->dev, true);
         return 0;
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index a116609b1914..cebcb405812e 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -531,7 +531,7 @@ menu "Port-mapped I/O GPIO drivers"
 
 config GPIO_104_DIO_48E
         tristate "ACCES 104-DIO-48E GPIO support"
-        depends on ISA
+        depends on ISA_BUS_API
         select GPIOLIB_IRQCHIP
         help
           Enables GPIO support for the ACCES 104-DIO-48E series (104-DIO-48E,
@@ -541,7 +541,7 @@ config GPIO_104_DIO_48E
 
 config GPIO_104_IDIO_16
         tristate "ACCES 104-IDIO-16 GPIO support"
-        depends on ISA
+        depends on ISA_BUS_API
         select GPIOLIB_IRQCHIP
         help
           Enables GPIO support for the ACCES 104-IDIO-16 family (104-IDIO-16,
@@ -552,7 +552,7 @@ config GPIO_104_IDIO_16
 
 config GPIO_104_IDI_48
         tristate "ACCES 104-IDI-48 GPIO support"
-        depends on ISA
+        depends on ISA_BUS_API
         select GPIOLIB_IRQCHIP
         help
           Enables GPIO support for the ACCES 104-IDI-48 family (104-IDI-48A,
@@ -628,7 +628,7 @@ config GPIO_TS5500
 
 config GPIO_WS16C48
         tristate "WinSystems WS16C48 GPIO support"
-        depends on ISA
+        depends on ISA_BUS_API
         select GPIOLIB_IRQCHIP
         help
           Enables GPIO support for the WinSystems WS16C48. The base port
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 01c36b8d6222..e055d5be1c3c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -799,7 +799,6 @@ struct amdgpu_ring {
         unsigned                cond_exe_offs;
         u64                             cond_exe_gpu_addr;
         volatile u32    *cond_exe_cpu_addr;
-        int                     vmid;
 };
 
 /*
@@ -937,8 +936,7 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring,
                     unsigned vm_id, uint64_t pd_addr,
                     uint32_t gds_base, uint32_t gds_size,
                     uint32_t gws_base, uint32_t gws_size,
-                    uint32_t oa_base, uint32_t oa_size,
-                    bool vmid_switch);
+                    uint32_t oa_base, uint32_t oa_size);
 void amdgpu_vm_reset_id(struct amdgpu_device *adev, unsigned vm_id);
 uint64_t amdgpu_vm_map_gart(const dma_addr_t *pages_addr, uint64_t addr);
 int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,
@@ -1822,6 +1820,8 @@ struct amdgpu_asic_funcs {
         /* MM block clocks */
         int (*set_uvd_clocks)(struct amdgpu_device *adev, u32 vclk, u32 dclk);
         int (*set_vce_clocks)(struct amdgpu_device *adev, u32 evclk, u32 ecclk);
+        /* query virtual capabilities */
+        u32 (*get_virtual_caps)(struct amdgpu_device *adev);
 };
 
 /*
@@ -1916,8 +1916,12 @@ void amdgpu_cgs_destroy_device(struct cgs_device *cgs_device);
 
 
 /* GPU virtualization */
+#define AMDGPU_VIRT_CAPS_SRIOV_EN       (1 << 0)
+#define AMDGPU_VIRT_CAPS_IS_VF          (1 << 1)
 struct amdgpu_virtualization {
         bool supports_sr_iov;
+        bool is_virtual;
+        u32 caps;
 };
 
 /*
@@ -2206,6 +2210,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)
 #define amdgpu_asic_get_xclk(adev) (adev)->asic_funcs->get_xclk((adev))
 #define amdgpu_asic_set_uvd_clocks(adev, v, d) (adev)->asic_funcs->set_uvd_clocks((adev), (v), (d))
 #define amdgpu_asic_set_vce_clocks(adev, ev, ec) (adev)->asic_funcs->set_vce_clocks((adev), (ev), (ec))
+#define amdgpu_asic_get_virtual_caps(adev) ((adev)->asic_funcs->get_virtual_caps((adev)))
 #define amdgpu_asic_get_gpu_clock_counter(adev) (adev)->asic_funcs->get_gpu_clock_counter((adev))
 #define amdgpu_asic_read_disabled_bios(adev) (adev)->asic_funcs->read_disabled_bios((adev))
 #define amdgpu_asic_read_bios_from_rom(adev, b, l) (adev)->asic_funcs->read_bios_from_rom((adev), (b), (l))
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 964f31404f17..66482b429458 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1385,6 +1385,15 @@ static int amdgpu_resume(struct amdgpu_device *adev)
         return 0;
 }
 
+static bool amdgpu_device_is_virtual(void)
+{
+#ifdef CONFIG_X86
+        return boot_cpu_has(X86_FEATURE_HYPERVISOR);
+#else
+        return false;
+#endif
+}
+
 /**
  * amdgpu_device_init - initialize the driver
  *
@@ -1519,8 +1528,14 @@ int amdgpu_device_init(struct amdgpu_device *adev,
         adev->virtualization.supports_sr_iov =
                 amdgpu_atombios_has_gpu_virtualization_table(adev);
 
+        /* Check if we are executing in a virtualized environment */
+        adev->virtualization.is_virtual = amdgpu_device_is_virtual();
+        adev->virtualization.caps = amdgpu_asic_get_virtual_caps(adev);
+
         /* Post card if necessary */
-        if (!amdgpu_card_posted(adev)) {
+        if (!amdgpu_card_posted(adev) ||
+            (adev->virtualization.is_virtual &&
+             !adev->virtualization.caps & AMDGPU_VIRT_CAPS_SRIOV_EN)) {
                 if (!adev->bios) {
                         dev_err(adev->dev, "Card not posted and no BIOS - ignoring\n");
                         return -EINVAL;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 7a0b1e50f293..34e35423b78e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -122,7 +122,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
         bool skip_preamble, need_ctx_switch;
         unsigned patch_offset = ~0;
         struct amdgpu_vm *vm;
-        int vmid = 0, old_vmid = ring->vmid;
         struct fence *hwf;
         uint64_t ctx;
 
@@ -136,11 +135,9 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
         if (job) {
                 vm = job->vm;
                 ctx = job->ctx;
-                vmid = job->vm_id;
         } else {
                 vm = NULL;
                 ctx = 0;
-                vmid = 0;
         }
 
         if (!ring->ready) {
@@ -166,8 +163,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
                 r = amdgpu_vm_flush(ring, job->vm_id, job->vm_pd_addr,
                                     job->gds_base, job->gds_size,
                                     job->gws_base, job->gws_size,
-                                    job->oa_base, job->oa_size,
-                                    (ring->current_ctx == ctx) && (old_vmid != vmid));
+                                    job->oa_base, job->oa_size);
                 if (r) {
                         amdgpu_ring_undo(ring);
                         return r;
@@ -184,6 +180,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
         need_ctx_switch = ring->current_ctx != ctx;
         for (i = 0; i < num_ibs; ++i) {
                 ib = &ibs[i];
+
                 /* drop preamble IBs if we don't have a context switch */
                 if ((ib->flags & AMDGPU_IB_FLAG_PREAMBLE) && skip_preamble)
                         continue;
@@ -191,7 +188,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
                 amdgpu_ring_emit_ib(ring, ib, job ? job->vm_id : 0,
                                     need_ctx_switch);
                 need_ctx_switch = false;
-                ring->vmid = vmid;
         }
 
         if (ring->funcs->emit_hdp_invalidate)
@@ -202,7 +198,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
                 dev_err(adev->dev, "failed to emit fence (%d)\n", r);
                 if (job && job->vm_id)
                         amdgpu_vm_reset_id(adev, job->vm_id);
-                ring->vmid = old_vmid;
                 amdgpu_ring_undo(ring);
                 return r;
         }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 62a4c127620f..9f36ed30ba11 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -298,8 +298,7 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring,
                     unsigned vm_id, uint64_t pd_addr,
                     uint32_t gds_base, uint32_t gds_size,
                     uint32_t gws_base, uint32_t gws_size,
-                    uint32_t oa_base, uint32_t oa_size,
-                    bool vmid_switch)
+                    uint32_t oa_base, uint32_t oa_size)
 {
         struct amdgpu_device *adev = ring->adev;
         struct amdgpu_vm_id *id = &adev->vm_manager.ids[vm_id];
@@ -313,7 +312,8 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring,
         int r;
 
         if (ring->funcs->emit_pipeline_sync && (
-            pd_addr != AMDGPU_VM_NO_FLUSH || gds_switch_needed || vmid_switch))
+            pd_addr != AMDGPU_VM_NO_FLUSH || gds_switch_needed ||
+                    ring->type == AMDGPU_RING_TYPE_COMPUTE))
                 amdgpu_ring_emit_pipeline_sync(ring);
 
         if (ring->funcs->emit_vm_flush &&
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 07bc795a4ca9..910431808542 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -962,6 +962,12 @@ static bool cik_read_bios_from_rom(struct amdgpu_device *adev,
         return true;
 }
 
+static u32 cik_get_virtual_caps(struct amdgpu_device *adev)
+{
+        /* CIK does not support SR-IOV */
+        return 0;
+}
+
 static const struct amdgpu_allowed_register_entry cik_allowed_read_registers[] = {
         {mmGRBM_STATUS, false},
         {mmGB_ADDR_CONFIG, false},
@@ -2007,6 +2013,7 @@ static const struct amdgpu_asic_funcs cik_asic_funcs =
         .get_xclk = &cik_get_xclk,
         .set_uvd_clocks = &cik_set_uvd_clocks,
         .set_vce_clocks = &cik_set_vce_clocks,
+        .get_virtual_caps = &cik_get_virtual_caps,
         /* these should be moved to their own ip modules */
         .get_gpu_clock_counter = &gfx_v7_0_get_gpu_clock_counter,
         .wait_for_mc_idle = &gmc_v7_0_mc_wait_for_idle,
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index 8c6ad1e72f02..fc8ff4d3ccf8 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@ -4833,7 +4833,7 @@ static int gfx_v7_0_eop_irq(struct amdgpu_device *adev,
         case 2:
                 for (i = 0; i < adev->gfx.num_compute_rings; i++) {
                         ring = &adev->gfx.compute_ring[i];
-                        if ((ring->me == me_id) & (ring->pipe == pipe_id))
+                        if ((ring->me == me_id) && (ring->pipe == pipe_id))
                                 amdgpu_fence_process(ring);
                 }
                 break;
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 2c88d0b66cf3..a65c96029476 100644
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -421,6 +421,20 @@ static bool vi_read_bios_from_rom(struct amdgpu_device *adev,
         return true;
 }
 
+static u32 vi_get_virtual_caps(struct amdgpu_device *adev)
+{
+        u32 caps = 0;
+        u32 reg = RREG32(mmBIF_IOV_FUNC_IDENTIFIER);
+
+        if (REG_GET_FIELD(reg, BIF_IOV_FUNC_IDENTIFIER, IOV_ENABLE))
+                caps |= AMDGPU_VIRT_CAPS_SRIOV_EN;
+
+        if (REG_GET_FIELD(reg, BIF_IOV_FUNC_IDENTIFIER, FUNC_IDENTIFIER))
+                caps |= AMDGPU_VIRT_CAPS_IS_VF;
+
+        return caps;
+}
+
 static const struct amdgpu_allowed_register_entry tonga_allowed_read_registers[] = {
         {mmGB_MACROTILE_MODE7, true},
 };
@@ -1118,6 +1132,7 @@ static const struct amdgpu_asic_funcs vi_asic_funcs =
         .get_xclk = &vi_get_xclk,
         .set_uvd_clocks = &vi_set_uvd_clocks,
         .set_vce_clocks = &vi_set_vce_clocks,
+        .get_virtual_caps = &vi_get_virtual_caps,
         /* these should be moved to their own ip modules */
         .get_gpu_clock_counter = &gfx_v8_0_get_gpu_clock_counter,
         .wait_for_mc_idle = &gmc_v8_0_mc_wait_for_idle,
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index ac005796b71c..7708d90b9da9 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -242,13 +242,19 @@ static void kfd_process_notifier_release(struct mmu_notifier *mn,
         pqm_uninit(&p->pqm);
 
         /* Iterate over all process device data structure and check
-         * if we should reset all wavefronts */
-        list_for_each_entry(pdd, &p->per_device_data, per_device_list)
+         * if we should delete debug managers and reset all wavefronts
+         */
+        list_for_each_entry(pdd, &p->per_device_data, per_device_list) {
+                if ((pdd->dev->dbgmgr) &&
+                                (pdd->dev->dbgmgr->pasid == p->pasid))
+                        kfd_dbgmgr_destroy(pdd->dev->dbgmgr);
+
                 if (pdd->reset_wavefronts) {
                         pr_warn("amdkfd: Resetting all wave fronts\n");
                         dbgdev_wave_reset_wavefronts(pdd->dev, p);
                         pdd->reset_wavefronts = false;
                 }
+        }
 
         mutex_unlock(&p->mutex);
 
@@ -404,42 +410,52 @@ void kfd_unbind_process_from_device(struct kfd_dev *dev, unsigned int pasid)
 
         idx = srcu_read_lock(&kfd_processes_srcu);
 
+        /*
+         * Look for the process that matches the pasid. If there is no such
+         * process, we either released it in amdkfd's own notifier, or there
+         * is a bug. Unfortunately, there is no way to tell...
+         */
         hash_for_each_rcu(kfd_processes_table, i, p, kfd_processes)
-                if (p->pasid == pasid)
-                        break;
+                if (p->pasid == pasid) {
 
-        srcu_read_unlock(&kfd_processes_srcu, idx);
+                        srcu_read_unlock(&kfd_processes_srcu, idx);
 
-        BUG_ON(p->pasid != pasid);
+                        pr_debug("Unbinding process %d from IOMMU\n", pasid);
 
-        mutex_lock(&p->mutex);
+                        mutex_lock(&p->mutex);
 
-        if ((dev->dbgmgr) && (dev->dbgmgr->pasid == p->pasid))
-                kfd_dbgmgr_destroy(dev->dbgmgr);
+                        if ((dev->dbgmgr) && (dev->dbgmgr->pasid == p->pasid))
+                                kfd_dbgmgr_destroy(dev->dbgmgr);
 
-        pqm_uninit(&p->pqm);
+                        pqm_uninit(&p->pqm);
 
-        pdd = kfd_get_process_device_data(dev, p);
+                        pdd = kfd_get_process_device_data(dev, p);
 
-        if (!pdd) {
-                mutex_unlock(&p->mutex);
-                return;
-        }
+                        if (!pdd) {
+                                mutex_unlock(&p->mutex);
+                                return;
+                        }
 
-        if (pdd->reset_wavefronts) {
-                dbgdev_wave_reset_wavefronts(pdd->dev, p);
-                pdd->reset_wavefronts = false;
-        }
+                        if (pdd->reset_wavefronts) {
+                                dbgdev_wave_reset_wavefronts(pdd->dev, p);
+                                pdd->reset_wavefronts = false;
+                        }
 
-        /*
-         * Just mark pdd as unbound, because we still need it to call
-         * amd_iommu_unbind_pasid() in when the process exits.
-         * We don't call amd_iommu_unbind_pasid() here
-         * because the IOMMU called us.
-         */
-        pdd->bound = false;
+                        /*
+                         * Just mark pdd as unbound, because we still need it
+                         * to call amd_iommu_unbind_pasid() in when the
+                         * process exits.
+                         * We don't call amd_iommu_unbind_pasid() here
+                         * because the IOMMU called us.
+                         */
+                        pdd->bound = false;
 
-        mutex_unlock(&p->mutex);
+                        mutex_unlock(&p->mutex);
+
+                        return;
+                }
+
+        srcu_read_unlock(&kfd_processes_srcu, idx);
 }
 
 struct kfd_process_device *kfd_get_first_process_device_data(struct kfd_process *p)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 74909e72a009..884c96f50c3d 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -666,7 +666,7 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr,
                         dev->node_props.simd_count);
 
         if (dev->mem_bank_count < dev->node_props.mem_banks_count) {
-                pr_warn("kfd: mem_banks_count truncated from %d to %d\n",
+                pr_info_once("kfd: mem_banks_count truncated from %d to %d\n",
                                 dev->node_props.mem_banks_count,
                                 dev->mem_bank_count);
                 sysfs_show_32bit_prop(buffer, "mem_banks_count",
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h
index 347fef127ce9..2930a3355948 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h
@@ -39,6 +39,7 @@ struct phm_ppt_v1_clock_voltage_dependency_record {
         uint8_t phases;
         uint8_t cks_enable;
         uint8_t cks_voffset;
+        uint32_t sclk_offset;
 };
 
 typedef struct phm_ppt_v1_clock_voltage_dependency_record phm_ppt_v1_clock_voltage_dependency_record;
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
index aa6be033f21b..1400bc420881 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
@@ -999,7 +999,7 @@ static int polaris10_get_dependency_volt_by_clk(struct pp_hwmgr *hwmgr,
                                 vddci = phm_find_closest_vddci(&(data->vddci_voltage_table),
                                                 (dep_table->entries[i].vddc -
                                                                 (uint16_t)data->vddc_vddci_delta));
-                                *voltage |= (vddci * VOLTAGE_SCALE) <<  VDDCI_SHIFT;
+                                *voltage |= (vddci * VOLTAGE_SCALE) << VDDCI_SHIFT;
                         }
 
                         if (POLARIS10_VOLTAGE_CONTROL_NONE == data->mvdd_control)
@@ -3520,10 +3520,11 @@ static int polaris10_get_pp_table_entry_callback_func(struct pp_hwmgr *hwmgr,
         ATOM_Tonga_State *state_entry = (ATOM_Tonga_State *)state;
         ATOM_Tonga_POWERPLAYTABLE *powerplay_table =
                         (ATOM_Tonga_POWERPLAYTABLE *)pp_table;
-        ATOM_Tonga_SCLK_Dependency_Table *sclk_dep_table =
-                        (ATOM_Tonga_SCLK_Dependency_Table *)
+        PPTable_Generic_SubTable_Header *sclk_dep_table =
+                        (PPTable_Generic_SubTable_Header *)
                         (((unsigned long)powerplay_table) +
                                 le16_to_cpu(powerplay_table->usSclkDependencyTableOffset));
+
         ATOM_Tonga_MCLK_Dependency_Table *mclk_dep_table =
                         (ATOM_Tonga_MCLK_Dependency_Table *)
                         (((unsigned long)powerplay_table) +
@@ -3575,7 +3576,11 @@ static int polaris10_get_pp_table_entry_callback_func(struct pp_hwmgr *hwmgr,
         /* Performance levels are arranged from low to high. */
         performance_level->memory_clock = mclk_dep_table->entries
                         [state_entry->ucMemoryClockIndexLow].ulMclk;
-        performance_level->engine_clock = sclk_dep_table->entries
+        if (sclk_dep_table->ucRevId == 0)
+                performance_level->engine_clock = ((ATOM_Tonga_SCLK_Dependency_Table *)sclk_dep_table)->entries
+                        [state_entry->ucEngineClockIndexLow].ulSclk;
+        else if (sclk_dep_table->ucRevId == 1)
+                performance_level->engine_clock = ((ATOM_Polaris_SCLK_Dependency_Table *)sclk_dep_table)->entries
                         [state_entry->ucEngineClockIndexLow].ulSclk;
         performance_level->pcie_gen = get_pcie_gen_support(data->pcie_gen_cap,
                         state_entry->ucPCIEGenLow);
@@ -3586,8 +3591,14 @@ static int polaris10_get_pp_table_entry_callback_func(struct pp_hwmgr *hwmgr,
                         [polaris10_power_state->performance_level_count++]);
         performance_level->memory_clock = mclk_dep_table->entries
                         [state_entry->ucMemoryClockIndexHigh].ulMclk;
-        performance_level->engine_clock = sclk_dep_table->entries
+
+        if (sclk_dep_table->ucRevId == 0)
+                performance_level->engine_clock = ((ATOM_Tonga_SCLK_Dependency_Table *)sclk_dep_table)->entries
                         [state_entry->ucEngineClockIndexHigh].ulSclk;
+        else if (sclk_dep_table->ucRevId == 1)
+                performance_level->engine_clock = ((ATOM_Polaris_SCLK_Dependency_Table *)sclk_dep_table)->entries
+                        [state_entry->ucEngineClockIndexHigh].ulSclk;
+
         performance_level->pcie_gen = get_pcie_gen_support(data->pcie_gen_cap,
                         state_entry->ucPCIEGenHigh);
         performance_level->pcie_lane = get_pcie_lane_support(data->pcie_lane_cap,
@@ -3645,7 +3656,6 @@ static int polaris10_get_pp_table_entry(struct pp_hwmgr *hwmgr,
                 switch (state->classification.ui_label) {
                 case PP_StateUILabel_Performance:
                         data->use_pcie_performance_levels = true;
-
                         for (i = 0; i < ps->performance_level_count; i++) {
                                 if (data->pcie_gen_performance.max <
                                                 ps->performance_levels[i].pcie_gen)
@@ -3661,7 +3671,6 @@ static int polaris10_get_pp_table_entry(struct pp_hwmgr *hwmgr,
                                                 ps->performance_levels[i].pcie_lane)
                                         data->pcie_lane_performance.max =
                                                         ps->performance_levels[i].pcie_lane;
-
                                 if (data->pcie_lane_performance.min >
                                                 ps->performance_levels[i].pcie_lane)
                                         data->pcie_lane_performance.min =
@@ -4187,12 +4196,9 @@ int polaris10_update_samu_dpm(struct pp_hwmgr *hwmgr, bool bgate)
 {
         struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
         uint32_t mm_boot_level_offset, mm_boot_level_value;
-        struct phm_ppt_v1_information *table_info =
-                        (struct phm_ppt_v1_information *)(hwmgr->pptable);
 
         if (!bgate) {
-                data->smc_state_table.SamuBootLevel =
-                                (uint8_t) (table_info->mm_dep_table->count - 1);
+                data->smc_state_table.SamuBootLevel = 0;
                 mm_boot_level_offset = data->dpm_table_start +
                                 offsetof(SMU74_Discrete_DpmTable, SamuBootLevel);
                 mm_boot_level_offset /= 4;
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_pptable.h b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_pptable.h
index 1b44f4e9b8f5..f127198aafc4 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_pptable.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_pptable.h
@@ -197,6 +197,22 @@ typedef struct _ATOM_Tonga_SCLK_Dependency_Table {
         ATOM_Tonga_SCLK_Dependency_Record entries[1];                            /* Dynamically allocate entries. */
 } ATOM_Tonga_SCLK_Dependency_Table;
 
+typedef struct _ATOM_Polaris_SCLK_Dependency_Record {
+        UCHAR  ucVddInd;                                                                                        /* Base voltage */
+        USHORT usVddcOffset;                                                                            /* Offset relative to base voltage */
+        ULONG ulSclk;
+        USHORT usEdcCurrent;
+        UCHAR  ucReliabilityTemperature;
+        UCHAR  ucCKSVOffsetandDisable;                  /* Bits 0~6: Voltage offset for CKS, Bit 7: Disable/enable for the SCLK level. */
+        ULONG  ulSclkOffset;
+} ATOM_Polaris_SCLK_Dependency_Record;
+
+typedef struct _ATOM_Polaris_SCLK_Dependency_Table {
+        UCHAR ucRevId;
+        UCHAR ucNumEntries;                                                     /* Number of entries. */
+        ATOM_Polaris_SCLK_Dependency_Record entries[1];                          /* Dynamically allocate entries. */
+} ATOM_Polaris_SCLK_Dependency_Table;
+
 typedef struct _ATOM_Tonga_PCIE_Record {
         UCHAR ucPCIEGenSpeed;
         UCHAR usPCIELaneWidth;
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
index 296ec7ef6d45..671fdb4d615a 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
@@ -408,41 +408,78 @@ static int get_mclk_voltage_dependency_table(
 static int get_sclk_voltage_dependency_table(
                 struct pp_hwmgr *hwmgr,
                 phm_ppt_v1_clock_voltage_dependency_table **pp_tonga_sclk_dep_table,
-                const ATOM_Tonga_SCLK_Dependency_Table * sclk_dep_table
+                const PPTable_Generic_SubTable_Header *sclk_dep_table
                 )
 {
         uint32_t table_size, i;
         phm_ppt_v1_clock_voltage_dependency_table *sclk_table;
 
-        PP_ASSERT_WITH_CODE((0 != sclk_dep_table->ucNumEntries),
-                "Invalid PowerPlay Table!", return -1);
+        if (sclk_dep_table->ucRevId < 1) {
+                const ATOM_Tonga_SCLK_Dependency_Table *tonga_table =
+                            (ATOM_Tonga_SCLK_Dependency_Table *)sclk_dep_table;
 
-        table_size = sizeof(uint32_t) + sizeof(phm_ppt_v1_clock_voltage_dependency_record)
-                * sclk_dep_table->ucNumEntries;
+                PP_ASSERT_WITH_CODE((0 != tonga_table->ucNumEntries),
+                        "Invalid PowerPlay Table!", return -1);
 
-        sclk_table = (phm_ppt_v1_clock_voltage_dependency_table *)
-                kzalloc(table_size, GFP_KERNEL);
+                table_size = sizeof(uint32_t) + sizeof(phm_ppt_v1_clock_voltage_dependency_record)
+                        * tonga_table->ucNumEntries;
 
-        if (NULL == sclk_table)
-                return -ENOMEM;
+                sclk_table = (phm_ppt_v1_clock_voltage_dependency_table *)
+                        kzalloc(table_size, GFP_KERNEL);
 
-        memset(sclk_table, 0x00, table_size);
-
-        sclk_table->count = (uint32_t)sclk_dep_table->ucNumEntries;
-
-        for (i = 0; i < sclk_dep_table->ucNumEntries; i++) {
-                sclk_table->entries[i].vddInd =
-                        sclk_dep_table->entries[i].ucVddInd;
-                sclk_table->entries[i].vdd_offset =
-                        sclk_dep_table->entries[i].usVddcOffset;
-                sclk_table->entries[i].clk =
-                        sclk_dep_table->entries[i].ulSclk;
-                sclk_table->entries[i].cks_enable =
-                        (((sclk_dep_table->entries[i].ucCKSVOffsetandDisable & 0x80) >> 7) == 0) ? 1 : 0;
-                sclk_table->entries[i].cks_voffset =
-                        (sclk_dep_table->entries[i].ucCKSVOffsetandDisable & 0x7F);
-        }
+                if (NULL == sclk_table)
+                        return -ENOMEM;
+
+                memset(sclk_table, 0x00, table_size);
+
+                sclk_table->count = (uint32_t)tonga_table->ucNumEntries;
+
+                for (i = 0; i < tonga_table->ucNumEntries; i++) {
+                        sclk_table->entries[i].vddInd =
+                                tonga_table->entries[i].ucVddInd;
+                        sclk_table->entries[i].vdd_offset =
+                                tonga_table->entries[i].usVddcOffset;
+                        sclk_table->entries[i].clk =
+                                tonga_table->entries[i].ulSclk;
+                        sclk_table->entries[i].cks_enable =
+                                (((tonga_table->entries[i].ucCKSVOffsetandDisable & 0x80) >> 7) == 0) ? 1 : 0;
+                        sclk_table->entries[i].cks_voffset =
+                                (tonga_table->entries[i].ucCKSVOffsetandDisable & 0x7F);
+                }
+        } else {
+                const ATOM_Polaris_SCLK_Dependency_Table *polaris_table =
+                            (ATOM_Polaris_SCLK_Dependency_Table *)sclk_dep_table;
 
+                PP_ASSERT_WITH_CODE((0 != polaris_table->ucNumEntries),
+                        "Invalid PowerPlay Table!", return -1);
+
+                table_size = sizeof(uint32_t) + sizeof(phm_ppt_v1_clock_voltage_dependency_record)
+                        * polaris_table->ucNumEntries;
+
+                sclk_table = (phm_ppt_v1_clock_voltage_dependency_table *)
+                        kzalloc(table_size, GFP_KERNEL);
+
+                if (NULL == sclk_table)
+                        return -ENOMEM;
+
+                memset(sclk_table, 0x00, table_size);
+
+                sclk_table->count = (uint32_t)polaris_table->ucNumEntries;
+
+                for (i = 0; i < polaris_table->ucNumEntries; i++) {
+                        sclk_table->entries[i].vddInd =
+                                polaris_table->entries[i].ucVddInd;
+                        sclk_table->entries[i].vdd_offset =
+                                polaris_table->entries[i].usVddcOffset;
+                        sclk_table->entries[i].clk =
+                                polaris_table->entries[i].ulSclk;
+                        sclk_table->entries[i].cks_enable =
+                                (((polaris_table->entries[i].ucCKSVOffsetandDisable & 0x80) >> 7) == 0) ? 1 : 0;
+                        sclk_table->entries[i].cks_voffset =
+                                (polaris_table->entries[i].ucCKSVOffsetandDisable & 0x7F);
+                        sclk_table->entries[i].sclk_offset = polaris_table->entries[i].ulSclkOffset;
+                }
+        }
         *pp_tonga_sclk_dep_table = sclk_table;
 
         return 0;
@@ -708,8 +745,8 @@ static int init_clock_voltage_dependency(
         const ATOM_Tonga_MCLK_Dependency_Table *mclk_dep_table =
                 (const ATOM_Tonga_MCLK_Dependency_Table *)(((unsigned long) powerplay_table) +
                 le16_to_cpu(powerplay_table->usMclkDependencyTableOffset));
-        const ATOM_Tonga_SCLK_Dependency_Table *sclk_dep_table =
-                (const ATOM_Tonga_SCLK_Dependency_Table *)(((unsigned long) powerplay_table) +
+        const PPTable_Generic_SubTable_Header *sclk_dep_table =
+                (const PPTable_Generic_SubTable_Header *)(((unsigned long) powerplay_table) +
                 le16_to_cpu(powerplay_table->usSclkDependencyTableOffset));
         const ATOM_Tonga_Hard_Limit_Table *pHardLimits =
                 (const ATOM_Tonga_Hard_Limit_Table *)(((unsigned long) powerplay_table) +
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index a6e42433ef0e..26feb2f8453f 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -528,11 +528,11 @@ drm_crtc_helper_disable(struct drm_crtc *crtc)
 int drm_crtc_helper_set_config(struct drm_mode_set *set)
 {
         struct drm_device *dev;
-        struct drm_crtc *new_crtc;
-        struct drm_encoder *save_encoders, *new_encoder, *encoder;
+        struct drm_crtc **save_encoder_crtcs, *new_crtc;
+        struct drm_encoder **save_connector_encoders, *new_encoder, *encoder;
         bool mode_changed = false; /* if true do a full mode set */
         bool fb_changed = false; /* if true and !mode_changed just do a flip */
-        struct drm_connector *save_connectors, *connector;
+        struct drm_connector *connector;
         int count = 0, ro, fail = 0;
         const struct drm_crtc_helper_funcs *crtc_funcs;
         struct drm_mode_set save_set;
@@ -574,15 +574,15 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
          * Allocate space for the backup of all (non-pointer) encoder and
          * connector data.
          */
-        save_encoders = kzalloc(dev->mode_config.num_encoder *
-                                sizeof(struct drm_encoder), GFP_KERNEL);
-        if (!save_encoders)
+        save_encoder_crtcs = kzalloc(dev->mode_config.num_encoder *
+                                sizeof(struct drm_crtc *), GFP_KERNEL);
+        if (!save_encoder_crtcs)
                 return -ENOMEM;
 
-        save_connectors = kzalloc(dev->mode_config.num_connector *
-                                sizeof(struct drm_connector), GFP_KERNEL);
-        if (!save_connectors) {
-                kfree(save_encoders);
+        save_connector_encoders = kzalloc(dev->mode_config.num_connector *
+                                sizeof(struct drm_encoder *), GFP_KERNEL);
+        if (!save_connector_encoders) {
+                kfree(save_encoder_crtcs);
                 return -ENOMEM;
         }
 
@@ -593,12 +593,12 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
          */
         count = 0;
         drm_for_each_encoder(encoder, dev) {
-                save_encoders[count++] = *encoder;
+                save_encoder_crtcs[count++] = encoder->crtc;
         }
 
         count = 0;
         drm_for_each_connector(connector, dev) {
-                save_connectors[count++] = *connector;
+                save_connector_encoders[count++] = connector->encoder;
         }
 
         save_set.crtc = set->crtc;
@@ -631,8 +631,12 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                 mode_changed = true;
         }
 
-        /* take a reference on all connectors in set */
+        /* take a reference on all unbound connectors in set, reuse the
+         * already taken reference for bound connectors
+         */
         for (ro = 0; ro < set->num_connectors; ro++) {
+                if (set->connectors[ro]->encoder)
+                        continue;
                 drm_connector_reference(set->connectors[ro]);
         }
 
@@ -754,30 +758,28 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                 }
         }
 
-        /* after fail drop reference on all connectors in save set */
-        count = 0;
-        drm_for_each_connector(connector, dev) {
-                drm_connector_unreference(&save_connectors[count++]);
-        }
-
-        kfree(save_connectors);
-        kfree(save_encoders);
+        kfree(save_connector_encoders);
+        kfree(save_encoder_crtcs);
         return 0;
 
 fail:
         /* Restore all previous data. */
         count = 0;
         drm_for_each_encoder(encoder, dev) {
-                *encoder = save_encoders[count++];
+                encoder->crtc = save_encoder_crtcs[count++];
         }
 
         count = 0;
         drm_for_each_connector(connector, dev) {
-                *connector = save_connectors[count++];
+                connector->encoder = save_connector_encoders[count++];
         }
 
-        /* after fail drop reference on all connectors in set */
+        /* after fail drop reference on all unbound connectors in set, let
+         * bound connectors keep their reference
+         */
         for (ro = 0; ro < set->num_connectors; ro++) {
+                if (set->connectors[ro]->encoder)
+                        continue;
                 drm_connector_unreference(set->connectors[ro]);
         }
 
@@ -787,8 +789,8 @@ fail:
                                       save_set.y, save_set.fb))
                 DRM_ERROR("failed to restore config after modeset failure\n");
 
-        kfree(save_connectors);
-        kfree(save_encoders);
+        kfree(save_connector_encoders);
+        kfree(save_encoder_crtcs);
         return ret;
 }
 EXPORT_SYMBOL(drm_crtc_helper_set_config);
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index a13edf5de2d6..6537908050d7 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -2927,11 +2927,9 @@ static void drm_dp_destroy_connector_work(struct work_struct *work)
                 drm_dp_port_teardown_pdt(port, port->pdt);
 
                 if (!port->input && port->vcpi.vcpi > 0) {
-                        if (mgr->mst_state) {
-                                drm_dp_mst_reset_vcpi_slots(mgr, port);
-                                drm_dp_update_payload_part1(mgr);
-                                drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);
-                        }
+                        drm_dp_mst_reset_vcpi_slots(mgr, port);
+                        drm_dp_update_payload_part1(mgr);
+                        drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);
                 }
 
                 kref_put(&port->kref, drm_dp_free_mst_port);
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c
index 522cfd447892..16353ee81651 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c
@@ -225,6 +225,7 @@ struct iommu_domain *etnaviv_iommu_domain_alloc(struct etnaviv_gpu *gpu)
 
         etnaviv_domain->domain.type = __IOMMU_DOMAIN_PAGING;
         etnaviv_domain->domain.ops = &etnaviv_iommu_ops.ops;
+        etnaviv_domain->domain.pgsize_bitmap = SZ_4K;
         etnaviv_domain->domain.geometry.aperture_start = GPU_MEM_START;
         etnaviv_domain->domain.geometry.aperture_end = GPU_MEM_START + PT_ENTRIES * SZ_4K - 1;
 
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 5faacc6e548d..7c334e902266 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3481,6 +3481,7 @@ int intel_bios_init(struct drm_i915_private *dev_priv);
 bool intel_bios_is_valid_vbt(const void *buf, size_t size);
 bool intel_bios_is_tv_present(struct drm_i915_private *dev_priv);
 bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin);
+bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port port);
 bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port);
 bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *dev_priv, enum port port);
 bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv, enum port *port);
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index b235b6e88ead..b9022fa053d6 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -139,6 +139,11 @@ fill_detail_timing_data(struct drm_display_mode *panel_fixed_mode,
         else
                 panel_fixed_mode->flags |= DRM_MODE_FLAG_NVSYNC;
 
+        panel_fixed_mode->width_mm = (dvo_timing->himage_hi << 8) |
+                dvo_timing->himage_lo;
+        panel_fixed_mode->height_mm = (dvo_timing->vimage_hi << 8) |
+                dvo_timing->vimage_lo;
+
         /* Some VBTs have bogus h/vtotal values */
         if (panel_fixed_mode->hsync_end > panel_fixed_mode->htotal)
                 panel_fixed_mode->htotal = panel_fixed_mode->hsync_end + 1;
@@ -1187,7 +1192,7 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
         }
         if (bdb->version < 106) {
                 expected_size = 22;
-        } else if (bdb->version < 109) {
+        } else if (bdb->version < 111) {
                 expected_size = 27;
         } else if (bdb->version < 195) {
                 BUILD_BUG_ON(sizeof(struct old_child_dev_config) != 33);
@@ -1546,6 +1551,45 @@ bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin)
 }
 
 /**
+ * intel_bios_is_port_present - is the specified digital port present
+ * @dev_priv:   i915 device instance
+ * @port:       port to check
+ *
+ * Return true if the device in %port is present.
+ */
+bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port port)
+{
+        static const struct {
+                u16 dp, hdmi;
+        } port_mapping[] = {
+                [PORT_B] = { DVO_PORT_DPB, DVO_PORT_HDMIB, },
+                [PORT_C] = { DVO_PORT_DPC, DVO_PORT_HDMIC, },
+                [PORT_D] = { DVO_PORT_DPD, DVO_PORT_HDMID, },
+                [PORT_E] = { DVO_PORT_DPE, DVO_PORT_HDMIE, },
+        };
+        int i;
+
+        /* FIXME maybe deal with port A as well? */
+        if (WARN_ON(port == PORT_A) || port >= ARRAY_SIZE(port_mapping))
+                return false;
+
+        if (!dev_priv->vbt.child_dev_num)
+                return false;
+
+        for (i = 0; i < dev_priv->vbt.child_dev_num; i++) {
+                const union child_device_config *p_child =
+                        &dev_priv->vbt.child_dev[i];
+                if ((p_child->common.dvo_port == port_mapping[port].dp ||
+                     p_child->common.dvo_port == port_mapping[port].hdmi) &&
+                    (p_child->common.device_type & (DEVICE_TYPE_TMDS_DVI_SIGNALING |
+                                                    DEVICE_TYPE_DISPLAYPORT_OUTPUT)))
+                        return true;
+        }
+
+        return false;
+}
+
+/**
  * intel_bios_is_port_edp - is the device in given port eDP
  * @dev_priv:   i915 device instance
  * @port:       port to check
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2113f401f0ba..56a1637c864f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8275,12 +8275,14 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_encoder *encoder;
+        int i;
         u32 val, final;
         bool has_lvds = false;
         bool has_cpu_edp = false;
         bool has_panel = false;
         bool has_ck505 = false;
         bool can_ssc = false;
+        bool using_ssc_source = false;
 
         /* We need to take the global config into account */
         for_each_intel_encoder(dev, encoder) {
@@ -8307,8 +8309,22 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
                 can_ssc = true;
         }
 
-        DRM_DEBUG_KMS("has_panel %d has_lvds %d has_ck505 %d\n",
-                      has_panel, has_lvds, has_ck505);
+        /* Check if any DPLLs are using the SSC source */
+        for (i = 0; i < dev_priv->num_shared_dpll; i++) {
+                u32 temp = I915_READ(PCH_DPLL(i));
+
+                if (!(temp & DPLL_VCO_ENABLE))
+                        continue;
+
+                if ((temp & PLL_REF_INPUT_MASK) ==
+                    PLLB_REF_INPUT_SPREADSPECTRUMIN) {
+                        using_ssc_source = true;
+                        break;
+                }
+        }
+
+        DRM_DEBUG_KMS("has_panel %d has_lvds %d has_ck505 %d using_ssc_source %d\n",
+                      has_panel, has_lvds, has_ck505, using_ssc_source);
 
         /* Ironlake: try to setup display ref clock before DPLL
          * enabling. This is only under driver's control after
@@ -8345,9 +8361,9 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
                                 final |= DREF_CPU_SOURCE_OUTPUT_NONSPREAD;
                 } else
                         final |= DREF_CPU_SOURCE_OUTPUT_DISABLE;
-        } else {
-                final |= DREF_SSC_SOURCE_DISABLE;
-                final |= DREF_CPU_SOURCE_OUTPUT_DISABLE;
+        } else if (using_ssc_source) {
+                final |= DREF_SSC_SOURCE_ENABLE;
+                final |= DREF_SSC1_ENABLE;
         }
 
         if (final == val)
@@ -8393,7 +8409,7 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
                 POSTING_READ(PCH_DREF_CONTROL);
                 udelay(200);
         } else {
-                DRM_DEBUG_KMS("Disabling SSC entirely\n");
+                DRM_DEBUG_KMS("Disabling CPU source output\n");
 
                 val &= ~DREF_CPU_SOURCE_OUTPUT_MASK;
 
@@ -8404,16 +8420,20 @@ static void ironlake_init_pch_refclk(struct drm_device *dev)
                 POSTING_READ(PCH_DREF_CONTROL);
                 udelay(200);
 
-                /* Turn off the SSC source */
-                val &= ~DREF_SSC_SOURCE_MASK;
-                val |= DREF_SSC_SOURCE_DISABLE;
+                if (!using_ssc_source) {
+                        DRM_DEBUG_KMS("Disabling SSC source\n");
 
-                /* Turn off SSC1 */
-                val &= ~DREF_SSC1_ENABLE;
+                        /* Turn off the SSC source */
+                        val &= ~DREF_SSC_SOURCE_MASK;
+                        val |= DREF_SSC_SOURCE_DISABLE;
 
-                I915_WRITE(PCH_DREF_CONTROL, val);
-                POSTING_READ(PCH_DREF_CONTROL);
-                udelay(200);
+                        /* Turn off SSC1 */
+                        val &= ~DREF_SSC1_ENABLE;
+
+                        I915_WRITE(PCH_DREF_CONTROL, val);
+                        POSTING_READ(PCH_DREF_CONTROL);
+                        udelay(200);
+                }
         }
 
         BUG_ON(val != final);
@@ -14554,6 +14574,8 @@ static void intel_setup_outputs(struct drm_device *dev)
                 if (I915_READ(PCH_DP_D) & DP_DETECTED)
                         intel_dp_init(dev, PCH_DP_D, PORT_D);
         } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
+                bool has_edp, has_port;
+
                 /*
                  * The DP_DETECTED bit is the latched state of the DDC
                  * SDA pin at boot. However since eDP doesn't require DDC
@@ -14562,27 +14584,37 @@ static void intel_setup_outputs(struct drm_device *dev)
                  * Thus we can't rely on the DP_DETECTED bit alone to detect
                  * eDP ports. Consult the VBT as well as DP_DETECTED to
                  * detect eDP ports.
+                 *
+                 * Sadly the straps seem to be missing sometimes even for HDMI
+                 * ports (eg. on Voyo V3 - CHT x7-Z8700), so check both strap
+                 * and VBT for the presence of the port. Additionally we can't
+                 * trust the port type the VBT declares as we've seen at least
+                 * HDMI ports that the VBT claim are DP or eDP.
                  */
-                if (I915_READ(VLV_HDMIB) & SDVO_DETECTED &&
-                    !intel_dp_is_edp(dev, PORT_B))
+                has_edp = intel_dp_is_edp(dev, PORT_B);
+                has_port = intel_bios_is_port_present(dev_priv, PORT_B);
+                if (I915_READ(VLV_DP_B) & DP_DETECTED || has_port)
+                        has_edp &= intel_dp_init(dev, VLV_DP_B, PORT_B);
+                if ((I915_READ(VLV_HDMIB) & SDVO_DETECTED || has_port) && !has_edp)
                         intel_hdmi_init(dev, VLV_HDMIB, PORT_B);
-                if (I915_READ(VLV_DP_B) & DP_DETECTED ||
-                    intel_dp_is_edp(dev, PORT_B))
-                        intel_dp_init(dev, VLV_DP_B, PORT_B);
 
-                if (I915_READ(VLV_HDMIC) & SDVO_DETECTED &&
-                    !intel_dp_is_edp(dev, PORT_C))
+                has_edp = intel_dp_is_edp(dev, PORT_C);
+                has_port = intel_bios_is_port_present(dev_priv, PORT_C);
+                if (I915_READ(VLV_DP_C) & DP_DETECTED || has_port)
+                        has_edp &= intel_dp_init(dev, VLV_DP_C, PORT_C);
+                if ((I915_READ(VLV_HDMIC) & SDVO_DETECTED || has_port) && !has_edp)
                         intel_hdmi_init(dev, VLV_HDMIC, PORT_C);
-                if (I915_READ(VLV_DP_C) & DP_DETECTED ||
-                    intel_dp_is_edp(dev, PORT_C))
-                        intel_dp_init(dev, VLV_DP_C, PORT_C);
 
                 if (IS_CHERRYVIEW(dev)) {
-                        /* eDP not supported on port D, so don't check VBT */
-                        if (I915_READ(CHV_HDMID) & SDVO_DETECTED)
-                                intel_hdmi_init(dev, CHV_HDMID, PORT_D);
-                        if (I915_READ(CHV_DP_D) & DP_DETECTED)
+                        /*
+                         * eDP not supported on port D,
+                         * so no need to worry about it
+                         */
+                        has_port = intel_bios_is_port_present(dev_priv, PORT_D);
+                        if (I915_READ(CHV_DP_D) & DP_DETECTED || has_port)
                                 intel_dp_init(dev, CHV_DP_D, PORT_D);
+                        if (I915_READ(CHV_HDMID) & SDVO_DETECTED || has_port)
+                                intel_hdmi_init(dev, CHV_HDMID, PORT_D);
                 }
 
                 intel_dsi_init(dev);
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index f192f58708c2..ffe5f8430957 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5725,8 +5725,11 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
         if (!fixed_mode && dev_priv->vbt.lfp_lvds_vbt_mode) {
                 fixed_mode = drm_mode_duplicate(dev,
                                         dev_priv->vbt.lfp_lvds_vbt_mode);
-                if (fixed_mode)
+                if (fixed_mode) {
                         fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
+                        connector->display_info.width_mm = fixed_mode->width_mm;
+                        connector->display_info.height_mm = fixed_mode->height_mm;
+                }
         }
         mutex_unlock(&dev->mode_config.mutex);
 
@@ -5923,9 +5926,9 @@ fail:
         return false;
 }
 
-void
-intel_dp_init(struct drm_device *dev,
-              i915_reg_t output_reg, enum port port)
+bool intel_dp_init(struct drm_device *dev,
+                   i915_reg_t output_reg,
+                   enum port port)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_digital_port *intel_dig_port;
@@ -5935,7 +5938,7 @@ intel_dp_init(struct drm_device *dev,
 
         intel_dig_port = kzalloc(sizeof(*intel_dig_port), GFP_KERNEL);
         if (!intel_dig_port)
-                return;
+                return false;
 
         intel_connector = intel_connector_alloc();
         if (!intel_connector)
@@ -5992,7 +5995,7 @@ intel_dp_init(struct drm_device *dev,
         if (!intel_dp_init_connector(intel_dig_port, intel_connector))
                 goto err_init_connector;
 
-        return;
+        return true;
 
 err_init_connector:
         drm_encoder_cleanup(encoder);
@@ -6000,8 +6003,7 @@ err_encoder_init:
         kfree(intel_connector);
 err_connector_alloc:
         kfree(intel_dig_port);
-
-        return;
+        return false;
 }
 
 void intel_dp_mst_suspend(struct drm_device *dev)
diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
index 3ac705936b04..baf6f5584cbd 100644
--- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
@@ -366,6 +366,9 @@ ibx_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
                                              DPLL_ID_PCH_PLL_B);
         }
 
+        if (!pll)
+                return NULL;
+
         /* reference the pll */
         intel_reference_shared_dpll(pll, crtc_state);
 
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index a28b4aac1e02..4a24b0067a3a 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1284,7 +1284,7 @@ void intel_csr_ucode_suspend(struct drm_i915_private *);
 void intel_csr_ucode_resume(struct drm_i915_private *);
 
 /* intel_dp.c */
-void intel_dp_init(struct drm_device *dev, i915_reg_t output_reg, enum port port);
+bool intel_dp_init(struct drm_device *dev, i915_reg_t output_reg, enum port port);
 bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
                              struct intel_connector *intel_connector);
 void intel_dp_set_link_params(struct intel_dp *intel_dp,
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 366ad6c67ce4..4756ef639648 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -1545,6 +1545,9 @@ void intel_dsi_init(struct drm_device *dev)
                 goto err;
         }
 
+        connector->display_info.width_mm = fixed_mode->width_mm;
+        connector->display_info.height_mm = fixed_mode->height_mm;
+
         intel_panel_init(&intel_connector->panel, fixed_mode, NULL);
 
         intel_dsi_add_properties(intel_connector);
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 2c3bd9c2573e..a8844702d11b 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -2142,6 +2142,9 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
         enum port port = intel_dig_port->port;
         uint8_t alternate_ddc_pin;
 
+        DRM_DEBUG_KMS("Adding HDMI connector on port %c\n",
+                      port_name(port));
+
         if (WARN(intel_dig_port->max_lanes < 4,
                  "Not enough lanes (%d) for HDMI on port %c\n",
                  intel_dig_port->max_lanes, port_name(port)))
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index bc53c0dd34d0..96281e628d2a 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -1082,6 +1082,8 @@ void intel_lvds_init(struct drm_device *dev)
                 fixed_mode = drm_mode_duplicate(dev, dev_priv->vbt.lfp_lvds_vbt_mode);
                 if (fixed_mode) {
                         fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
+                        connector->display_info.width_mm = fixed_mode->width_mm;
+                        connector->display_info.height_mm = fixed_mode->height_mm;
                         goto out;
                 }
         }
diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
index c15051de8023..44fb0b35eed3 100644
--- a/drivers/gpu/drm/i915/intel_vbt_defs.h
+++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
@@ -403,9 +403,10 @@ struct lvds_dvo_timing {
         u8 vsync_off:4;
         u8 rsvd0:6;
         u8 hsync_off_hi:2;
-        u8 h_image;
-        u8 v_image;
-        u8 max_hv;
+        u8 himage_lo;
+        u8 vimage_lo;
+        u8 vimage_hi:4;
+        u8 himage_hi:4;
         u8 h_border;
         u8 v_border;
         u8 rsvd1:3;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
index 18fab3973ce5..62ad0300cfa5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
@@ -1614,7 +1614,7 @@ nvkm_device_pci_func = {
         .fini = nvkm_device_pci_fini,
         .resource_addr = nvkm_device_pci_resource_addr,
         .resource_size = nvkm_device_pci_resource_size,
-        .cpu_coherent = !IS_ENABLED(CONFIG_ARM) && !IS_ENABLED(CONFIG_ARM64),
+        .cpu_coherent = !IS_ENABLED(CONFIG_ARM),
 };
 
 int
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
index 323c79abe468..41bd5d0f7692 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
@@ -276,6 +276,8 @@ nvkm_iccsense_oneinit(struct nvkm_subdev *subdev)
                 struct pwr_rail_t *r = &stbl.rail[i];
                 struct nvkm_iccsense_rail *rail;
                 struct nvkm_iccsense_sensor *sensor;
+                int (*read)(struct nvkm_iccsense *,
+                            struct nvkm_iccsense_rail *);
 
                 if (!r->mode || r->resistor_mohm == 0)
                         continue;
@@ -284,31 +286,31 @@ nvkm_iccsense_oneinit(struct nvkm_subdev *subdev)
                 if (!sensor)
                         continue;
 
-                rail = kmalloc(sizeof(*rail), GFP_KERNEL);
-                if (!rail)
-                        return -ENOMEM;
-
                 switch (sensor->type) {
                 case NVBIOS_EXTDEV_INA209:
                         if (r->rail != 0)
                                 continue;
-                        rail->read = nvkm_iccsense_ina209_read;
+                        read = nvkm_iccsense_ina209_read;
                         break;
                 case NVBIOS_EXTDEV_INA219:
                         if (r->rail != 0)
                                 continue;
-                        rail->read = nvkm_iccsense_ina219_read;
+                        read = nvkm_iccsense_ina219_read;
                         break;
                 case NVBIOS_EXTDEV_INA3221:
                         if (r->rail >= 3)
                                 continue;
-                        rail->read = nvkm_iccsense_ina3221_read;
+                        read = nvkm_iccsense_ina3221_read;
                         break;
                 default:
                         continue;
                 }
 
+                rail = kmalloc(sizeof(*rail), GFP_KERNEL);
+                if (!rail)
+                        return -ENOMEM;
                 sensor->rail_mask |= 1 << r->rail;
+                rail->read = read;
                 rail->sensor = sensor;
                 rail->idx = r->rail;
                 rail->mohm = r->resistor_mohm;
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 2e216e2ea78c..259cd6e6d71c 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -589,7 +589,8 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
                 if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev) || ASIC_IS_DCE8(rdev))
                         radeon_crtc->pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV;
                 /* use frac fb div on RS780/RS880 */
-                if ((rdev->family == CHIP_RS780) || (rdev->family == CHIP_RS880))
+                if (((rdev->family == CHIP_RS780) || (rdev->family == CHIP_RS880))
+                    && !radeon_crtc->ss_enabled)
                         radeon_crtc->pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV;
                 if (ASIC_IS_DCE32(rdev) && mode->clock > 165000)
                         radeon_crtc->pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV;
@@ -626,7 +627,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
                         if (radeon_crtc->ss.refdiv) {
                                 radeon_crtc->pll_flags |= RADEON_PLL_USE_REF_DIV;
                                 radeon_crtc->pll_reference_div = radeon_crtc->ss.refdiv;
-                                if (ASIC_IS_AVIVO(rdev))
+                                if (rdev->family >= CHIP_RV770)
                                         radeon_crtc->pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV;
                         }
                 }
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index e721e6b2766e..21c44b2293bc 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -630,6 +630,23 @@ void radeon_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)
 /*
  * GPU helpers function.
  */
+
+/**
+ * radeon_device_is_virtual - check if we are running is a virtual environment
+ *
+ * Check if the asic has been passed through to a VM (all asics).
+ * Used at driver startup.
+ * Returns true if virtual or false if not.
+ */
+static bool radeon_device_is_virtual(void)
+{
+#ifdef CONFIG_X86
+        return boot_cpu_has(X86_FEATURE_HYPERVISOR);
+#else
+        return false;
+#endif
+}
+
 /**
  * radeon_card_posted - check if the hw has already been initialized
  *
@@ -643,6 +660,10 @@ bool radeon_card_posted(struct radeon_device *rdev)
 {
         uint32_t reg;
 
+        /* for pass through, always force asic_init */
+        if (radeon_device_is_virtual())
+                return false;
+
         /* required for EFI mode on macbook2,1 which uses an r5xx asic */
         if (efi_enabled(EFI_BOOT) &&
             (rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) &&
@@ -1631,7 +1652,7 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend,
         radeon_agp_suspend(rdev);
 
         pci_save_state(dev->pdev);
-        if (freeze && rdev->family >= CHIP_R600) {
+        if (freeze && rdev->family >= CHIP_CEDAR) {
                 rdev->asic->asic_reset(rdev, true);
                 pci_restore_state(dev->pdev);
         } else if (suspend) {
diff --git a/drivers/hid/hid-elo.c b/drivers/hid/hid-elo.c
index aad8c162a825..0cd4f7216239 100644
--- a/drivers/hid/hid-elo.c
+++ b/drivers/hid/hid-elo.c
@@ -261,7 +261,7 @@ static void elo_remove(struct hid_device *hdev)
         struct elo_priv *priv = hid_get_drvdata(hdev);
 
         hid_hw_stop(hdev);
-        flush_workqueue(wq);
+        cancel_delayed_work_sync(&priv->work);
         kfree(priv);
 }
 
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index c741f5e50a66..95b7d61d9910 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1401,6 +1401,11 @@ static const struct hid_device_id mt_devices[] = {
                 MT_USB_DEVICE(USB_VENDOR_ID_NOVATEK,
                         USB_DEVICE_ID_NOVATEK_PCT) },
 
+        /* Ntrig Panel */
+        { .driver_data = MT_CLS_NSMU,
+                HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
+                        USB_VENDOR_ID_NTRIG, 0x1b05) },
+
         /* PixArt optical touch screen */
         { .driver_data = MT_CLS_INRANGE_CONTACTNUMBER,
                 MT_USB_DEVICE(USB_VENDOR_ID_PIXART,
diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c
index 847d1b5f2c13..688be9e060fc 100644
--- a/drivers/hwtracing/coresight/coresight-tmc-etr.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c
@@ -300,13 +300,10 @@ int tmc_read_unprepare_etr(struct tmc_drvdata *drvdata)
         if (local_read(&drvdata->mode) == CS_MODE_SYSFS) {
                 /*
                  * The trace run will continue with the same allocated trace
-                 * buffer. As such zero-out the buffer so that we don't end
-                 * up with stale data.
-                 *
-                 * Since the tracer is still enabled drvdata::buf
-                 * can't be NULL.
+                 * buffer. The trace buffer is cleared in tmc_etr_enable_hw(),
+                 * so we don't have to explicitly clear it. Also, since the
+                 * tracer is still enabled drvdata::buf can't be NULL.
                  */
-                memset(drvdata->buf, 0, drvdata->size);
                 tmc_etr_enable_hw(drvdata);
         } else {
                 /*
@@ -315,7 +312,7 @@ int tmc_read_unprepare_etr(struct tmc_drvdata *drvdata)
                  */
                 vaddr = drvdata->vaddr;
                 paddr = drvdata->paddr;
-                drvdata->buf = NULL;
+                drvdata->buf = drvdata->vaddr = NULL;
         }
 
         drvdata->reading = false;
diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
index 5443d03a1eec..d08d1ab9bba5 100644
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight.c
@@ -385,7 +385,6 @@ static int _coresight_build_path(struct coresight_device *csdev,
         int i;
         bool found = false;
         struct coresight_node *node;
-        struct coresight_connection *conn;
 
         /* An activated sink has been found.  Enqueue the element */
         if ((csdev->type == CORESIGHT_DEV_TYPE_SINK ||
@@ -394,8 +393,9 @@ static int _coresight_build_path(struct coresight_device *csdev,
 
         /* Not a sink - recursively explore each port found on this element */
         for (i = 0; i < csdev->nr_outport; i++) {
-                conn = &csdev->conns[i];
-                if (_coresight_build_path(conn->child_dev, path) == 0) {
+                struct coresight_device *child_dev = csdev->conns[i].child_dev;
+
+                if (child_dev && _coresight_build_path(child_dev, path) == 0) {
                         found = true;
                         break;
                 }
@@ -425,6 +425,7 @@ out:
 struct list_head *coresight_build_path(struct coresight_device *csdev)
 {
         struct list_head *path;
+        int rc;
 
         path = kzalloc(sizeof(struct list_head), GFP_KERNEL);
         if (!path)
@@ -432,9 +433,10 @@ struct list_head *coresight_build_path(struct coresight_device *csdev)
 
         INIT_LIST_HEAD(path);
 
-        if (_coresight_build_path(csdev, path)) {
+        rc = _coresight_build_path(csdev, path);
+        if (rc) {
                 kfree(path);
-                path = NULL;
+                return ERR_PTR(rc);
         }
 
         return path;
@@ -507,8 +509,9 @@ int coresight_enable(struct coresight_device *csdev)
                 goto out;
 
         path = coresight_build_path(csdev);
-        if (!path) {
+        if (IS_ERR(path)) {
                 pr_err("building path(s) failed\n");
+                ret = PTR_ERR(path);
                 goto out;
         }
 
diff --git a/drivers/iio/accel/st_accel_buffer.c b/drivers/iio/accel/st_accel_buffer.c
index a1e642ee13d6..7fddc137e91e 100644
--- a/drivers/iio/accel/st_accel_buffer.c
+++ b/drivers/iio/accel/st_accel_buffer.c
@@ -91,7 +91,7 @@ static const struct iio_buffer_setup_ops st_accel_buffer_setup_ops = {
 
 int st_accel_allocate_ring(struct iio_dev *indio_dev)
 {
-        return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+        return iio_triggered_buffer_setup(indio_dev, NULL,
                 &st_sensors_trigger_handler, &st_accel_buffer_setup_ops);
 }
 
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index dc73f2d85e6d..4d95bfc4786c 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -741,6 +741,7 @@ static const struct iio_info accel_info = {
 static const struct iio_trigger_ops st_accel_trigger_ops = {
         .owner = THIS_MODULE,
         .set_trigger_state = ST_ACCEL_TRIGGER_SET_STATE,
+        .validate_device = st_sensors_validate_device,
 };
 #define ST_ACCEL_TRIGGER_OPS (&st_accel_trigger_ops)
 #else
diff --git a/drivers/iio/common/st_sensors/st_sensors_buffer.c b/drivers/iio/common/st_sensors/st_sensors_buffer.c
index c55898543a47..f1693dbebb8a 100644
--- a/drivers/iio/common/st_sensors/st_sensors_buffer.c
+++ b/drivers/iio/common/st_sensors/st_sensors_buffer.c
@@ -57,31 +57,20 @@ irqreturn_t st_sensors_trigger_handler(int irq, void *p)
         struct iio_poll_func *pf = p;
         struct iio_dev *indio_dev = pf->indio_dev;
         struct st_sensor_data *sdata = iio_priv(indio_dev);
+        s64 timestamp;
 
-        /* If we have a status register, check if this IRQ came from us */
-        if (sdata->sensor_settings->drdy_irq.addr_stat_drdy) {
-                u8 status;
-
-                len = sdata->tf->read_byte(&sdata->tb, sdata->dev,
-                           sdata->sensor_settings->drdy_irq.addr_stat_drdy,
-                           &status);
-                if (len < 0)
-                        dev_err(sdata->dev, "could not read channel status\n");
-
-                /*
-                 * If this was not caused by any channels on this sensor,
-                 * return IRQ_NONE
-                 */
-                if (!(status & (u8)indio_dev->active_scan_mask[0]))
-                        return IRQ_NONE;
-        }
+        /* If we do timetamping here, do it before reading the values */
+        if (sdata->hw_irq_trigger)
+                timestamp = sdata->hw_timestamp;
+        else
+                timestamp = iio_get_time_ns();
 
         len = st_sensors_get_buffer_element(indio_dev, sdata->buffer_data);
         if (len < 0)
                 goto st_sensors_get_buffer_element_error;
 
         iio_push_to_buffers_with_timestamp(indio_dev, sdata->buffer_data,
-                pf->timestamp);
+                                           timestamp);
 
 st_sensors_get_buffer_element_error:
         iio_trigger_notify_done(indio_dev->trig);
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index dffe00692169..9e59c90f6a8d 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -363,6 +363,11 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
         if (err < 0)
                 return err;
 
+        /* Disable DRDY, this might be still be enabled after reboot. */
+        err = st_sensors_set_dataready_irq(indio_dev, false);
+        if (err < 0)
+                return err;
+
         if (sdata->current_fullscale) {
                 err = st_sensors_set_fullscale(indio_dev,
                                                 sdata->current_fullscale->num);
@@ -424,6 +429,9 @@ int st_sensors_set_dataready_irq(struct iio_dev *indio_dev, bool enable)
         else
                 drdy_mask = sdata->sensor_settings->drdy_irq.mask_int2;
 
+        /* Flag to the poll function that the hardware trigger is in use */
+        sdata->hw_irq_trigger = enable;
+
         /* Enable/Disable the interrupt generator for data ready. */
         err = st_sensors_write_data_with_mask(indio_dev,
                                         sdata->sensor_settings->drdy_irq.addr,
diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c
index da72279fcf99..296e4ff19ae8 100644
--- a/drivers/iio/common/st_sensors/st_sensors_trigger.c
+++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c
@@ -17,6 +17,73 @@
 #include <linux/iio/common/st_sensors.h>
 #include "st_sensors_core.h"
 
+/**
+ * st_sensors_irq_handler() - top half of the IRQ-based triggers
+ * @irq: irq number
+ * @p: private handler data
+ */
+irqreturn_t st_sensors_irq_handler(int irq, void *p)
+{
+        struct iio_trigger *trig = p;
+        struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
+        struct st_sensor_data *sdata = iio_priv(indio_dev);
+
+        /* Get the time stamp as close in time as possible */
+        sdata->hw_timestamp = iio_get_time_ns();
+        return IRQ_WAKE_THREAD;
+}
+
+/**
+ * st_sensors_irq_thread() - bottom half of the IRQ-based triggers
+ * @irq: irq number
+ * @p: private handler data
+ */
+irqreturn_t st_sensors_irq_thread(int irq, void *p)
+{
+        struct iio_trigger *trig = p;
+        struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
+        struct st_sensor_data *sdata = iio_priv(indio_dev);
+        int ret;
+
+        /*
+         * If this trigger is backed by a hardware interrupt and we have a
+         * status register, check if this IRQ came from us
+         */
+        if (sdata->sensor_settings->drdy_irq.addr_stat_drdy) {
+                u8 status;
+
+                ret = sdata->tf->read_byte(&sdata->tb, sdata->dev,
+                           sdata->sensor_settings->drdy_irq.addr_stat_drdy,
+                           &status);
+                if (ret < 0) {
+                        dev_err(sdata->dev, "could not read channel status\n");
+                        goto out_poll;
+                }
+                /*
+                 * the lower bits of .active_scan_mask[0] is directly mapped
+                 * to the channels on the sensor: either bit 0 for
+                 * one-dimensional sensors, or e.g. x,y,z for accelerometers,
+                 * gyroscopes or magnetometers. No sensor use more than 3
+                 * channels, so cut the other status bits here.
+                 */
+                status &= 0x07;
+
+                /*
+                 * If this was not caused by any channels on this sensor,
+                 * return IRQ_NONE
+                 */
+                if (!indio_dev->active_scan_mask)
+                        return IRQ_NONE;
+                if (!(status & (u8)indio_dev->active_scan_mask[0]))
+                        return IRQ_NONE;
+        }
+
+out_poll:
+        /* It's our IRQ: proceed to handle the register polling */
+        iio_trigger_poll_chained(p);
+        return IRQ_HANDLED;
+}
+
 int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
                                 const struct iio_trigger_ops *trigger_ops)
 {
@@ -30,6 +97,10 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
                 return -ENOMEM;
         }
 
+        iio_trigger_set_drvdata(sdata->trig, indio_dev);
+        sdata->trig->ops = trigger_ops;
+        sdata->trig->dev.parent = sdata->dev;
+
         irq = sdata->get_irq_data_ready(indio_dev);
         irq_trig = irqd_get_trigger_type(irq_get_irq_data(irq));
         /*
@@ -77,9 +148,12 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
             sdata->sensor_settings->drdy_irq.addr_stat_drdy)
                 irq_trig |= IRQF_SHARED;
 
-        err = request_threaded_irq(irq,
-                        iio_trigger_generic_data_rdy_poll,
-                        NULL,
+        /* Let's create an interrupt thread masking the hard IRQ here */
+        irq_trig |= IRQF_ONESHOT;
+
+        err = request_threaded_irq(sdata->get_irq_data_ready(indio_dev),
+                        st_sensors_irq_handler,
+                        st_sensors_irq_thread,
                         irq_trig,
                         sdata->trig->name,
                         sdata->trig);
@@ -88,10 +162,6 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
                 goto iio_trigger_free;
         }
 
-        iio_trigger_set_drvdata(sdata->trig, indio_dev);
-        sdata->trig->ops = trigger_ops;
-        sdata->trig->dev.parent = sdata->dev;
-
         err = iio_trigger_register(sdata->trig);
         if (err < 0) {
                 dev_err(&indio_dev->dev, "failed to register iio trigger.\n");
@@ -119,6 +189,18 @@ void st_sensors_deallocate_trigger(struct iio_dev *indio_dev)
 }
 EXPORT_SYMBOL(st_sensors_deallocate_trigger);
 
+int st_sensors_validate_device(struct iio_trigger *trig,
+                               struct iio_dev *indio_dev)
+{
+        struct iio_dev *indio = iio_trigger_get_drvdata(trig);
+
+        if (indio != indio_dev)
+                return -EINVAL;
+
+        return 0;
+}
+EXPORT_SYMBOL(st_sensors_validate_device);
+
 MODULE_AUTHOR("Denis Ciocca <denis.ciocca@st.com>");
 MODULE_DESCRIPTION("STMicroelectronics ST-sensors trigger");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/dac/Kconfig b/drivers/iio/dac/Kconfig
index e63b957c985f..f7c71da42f15 100644
--- a/drivers/iio/dac/Kconfig
+++ b/drivers/iio/dac/Kconfig
@@ -247,7 +247,7 @@ config MCP4922
 
 config STX104
         tristate "Apex Embedded Systems STX104 DAC driver"
-        depends on X86 && ISA
+        depends on X86 && ISA_BUS_API
         help
           Say yes here to build support for the 2-channel DAC on the Apex
           Embedded Systems STX104 integrated analog PC/104 card. The base port
diff --git a/drivers/iio/dac/ad5592r-base.c b/drivers/iio/dac/ad5592r-base.c
index 948f600e7059..69bde5909854 100644
--- a/drivers/iio/dac/ad5592r-base.c
+++ b/drivers/iio/dac/ad5592r-base.c
@@ -525,7 +525,7 @@ static int ad5592r_alloc_channels(struct ad5592r_state *st)
 
         device_for_each_child_node(st->dev, child) {
                 ret = fwnode_property_read_u32(child, "reg", &reg);
-                if (ret || reg > ARRAY_SIZE(st->channel_modes))
+                if (ret || reg >= ARRAY_SIZE(st->channel_modes))
                         continue;
 
                 ret = fwnode_property_read_u32(child, "adi,mode", &tmp);
diff --git a/drivers/iio/gyro/st_gyro_buffer.c b/drivers/iio/gyro/st_gyro_buffer.c
index d67b17b6a7aa..a5377044e42f 100644
--- a/drivers/iio/gyro/st_gyro_buffer.c
+++ b/drivers/iio/gyro/st_gyro_buffer.c
@@ -91,7 +91,7 @@ static const struct iio_buffer_setup_ops st_gyro_buffer_setup_ops = {
 
 int st_gyro_allocate_ring(struct iio_dev *indio_dev)
 {
-        return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+        return iio_triggered_buffer_setup(indio_dev, NULL,
                 &st_sensors_trigger_handler, &st_gyro_buffer_setup_ops);
 }
 
diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index 52a3c87c375c..a8012955a1f6 100644
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -409,6 +409,7 @@ static const struct iio_info gyro_info = {
 static const struct iio_trigger_ops st_gyro_trigger_ops = {
         .owner = THIS_MODULE,
         .set_trigger_state = ST_GYRO_TRIGGER_SET_STATE,
+        .validate_device = st_sensors_validate_device,
 };
 #define ST_GYRO_TRIGGER_OPS (&st_gyro_trigger_ops)
 #else
diff --git a/drivers/iio/humidity/am2315.c b/drivers/iio/humidity/am2315.c
index 3be6d209a159..11535911a5c6 100644
--- a/drivers/iio/humidity/am2315.c
+++ b/drivers/iio/humidity/am2315.c
@@ -165,10 +165,8 @@ static irqreturn_t am2315_trigger_handler(int irq, void *p)
         struct am2315_sensor_data sensor_data;
 
         ret = am2315_read_data(data, &sensor_data);
-        if (ret < 0) {
-                mutex_unlock(&data->lock);
+        if (ret < 0)
                 goto err;
-        }
 
         mutex_lock(&data->lock);
         if (*(indio_dev->active_scan_mask) == AM2315_ALL_CHANNEL_MASK) {
diff --git a/drivers/iio/humidity/hdc100x.c b/drivers/iio/humidity/hdc100x.c
index fa4767613173..a03832a5fc95 100644
--- a/drivers/iio/humidity/hdc100x.c
+++ b/drivers/iio/humidity/hdc100x.c
@@ -55,7 +55,7 @@ static const struct {
         },
         { /* IIO_HUMIDITYRELATIVE channel */
                 .shift = 8,
-                .mask = 2,
+                .mask = 3,
         },
 };
 
@@ -164,14 +164,14 @@ static int hdc100x_get_measurement(struct hdc100x_data *data,
                 dev_err(&client->dev, "cannot read high byte measurement");
                 return ret;
         }
-        val = ret << 6;
+        val = ret << 8;
 
         ret = i2c_smbus_read_byte(client);
         if (ret < 0) {
                 dev_err(&client->dev, "cannot read low byte measurement");
                 return ret;
         }
-        val |= ret >> 2;
+        val |= ret;
 
         return val;
 }
@@ -211,18 +211,18 @@ static int hdc100x_read_raw(struct iio_dev *indio_dev,
                 return IIO_VAL_INT_PLUS_MICRO;
         case IIO_CHAN_INFO_SCALE:
                 if (chan->type == IIO_TEMP) {
-                        *val = 165;
-                        *val2 = 65536 >> 2;
+                        *val = 165000;
+                        *val2 = 65536;
                         return IIO_VAL_FRACTIONAL;
                 } else {
-                        *val = 0;
-                        *val2 = 10000;
-                        return IIO_VAL_INT_PLUS_MICRO;
+                        *val = 100;
+                        *val2 = 65536;
+                        return IIO_VAL_FRACTIONAL;
                 }
                 break;
         case IIO_CHAN_INFO_OFFSET:
-                *val = -3971;
-                *val2 = 879096;
+                *val = -15887;
+                *val2 = 515151;
                 return IIO_VAL_INT_PLUS_MICRO;
         default:
                 return -EINVAL;
diff --git a/drivers/iio/imu/bmi160/bmi160_core.c b/drivers/iio/imu/bmi160/bmi160_core.c
index 0bf92b06d7d8..b8a290ec984e 100644
--- a/drivers/iio/imu/bmi160/bmi160_core.c
+++ b/drivers/iio/imu/bmi160/bmi160_core.c
@@ -209,11 +209,11 @@ static const struct  bmi160_scale_item bmi160_scale_table[] = {
 };
 
 static const struct bmi160_odr bmi160_accel_odr[] = {
-        {0x01, 0, 78125},
-        {0x02, 1, 5625},
-        {0x03, 3, 125},
-        {0x04, 6, 25},
-        {0x05, 12, 5},
+        {0x01, 0, 781250},
+        {0x02, 1, 562500},
+        {0x03, 3, 125000},
+        {0x04, 6, 250000},
+        {0x05, 12, 500000},
         {0x06, 25, 0},
         {0x07, 50, 0},
         {0x08, 100, 0},
@@ -229,7 +229,7 @@ static const struct bmi160_odr bmi160_gyro_odr[] = {
         {0x08, 100, 0},
         {0x09, 200, 0},
         {0x0A, 400, 0},
-        {0x0B, 8000, 0},
+        {0x0B, 800, 0},
         {0x0C, 1600, 0},
         {0x0D, 3200, 0},
 };
@@ -364,8 +364,8 @@ int bmi160_set_odr(struct bmi160_data *data, enum bmi160_sensor_type t,
 
         return regmap_update_bits(data->regmap,
                                   bmi160_regs[t].config,
-                                  bmi160_odr_table[t].tbl[i].bits,
-                                  bmi160_regs[t].config_odr_mask);
+                                  bmi160_regs[t].config_odr_mask,
+                                  bmi160_odr_table[t].tbl[i].bits);
 }
 
 static int bmi160_get_odr(struct bmi160_data *data, enum bmi160_sensor_type t,
diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index ae2806aafb72..0c52dfe64977 100644
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -210,22 +210,35 @@ static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
 
         /* Prevent the module from being removed whilst attached to a trigger */
         __module_get(pf->indio_dev->info->driver_module);
+
+        /* Get irq number */
         pf->irq = iio_trigger_get_irq(trig);
+        if (pf->irq < 0)
+                goto out_put_module;
+
+        /* Request irq */
         ret = request_threaded_irq(pf->irq, pf->h, pf->thread,
                                    pf->type, pf->name,
                                    pf);
-        if (ret < 0) {
-                module_put(pf->indio_dev->info->driver_module);
-                return ret;
-        }
+        if (ret < 0)
+                goto out_put_irq;
 
+        /* Enable trigger in driver */
         if (trig->ops && trig->ops->set_trigger_state && notinuse) {
                 ret = trig->ops->set_trigger_state(trig, true);
                 if (ret < 0)
-                        module_put(pf->indio_dev->info->driver_module);
+                        goto out_free_irq;
         }
 
         return ret;
+
+out_free_irq:
+        free_irq(pf->irq, pf);
+out_put_irq:
+        iio_trigger_put_irq(trig, pf->irq);
+out_put_module:
+        module_put(pf->indio_dev->info->driver_module);
+        return ret;
 }
 
 static int iio_trigger_detach_poll_func(struct iio_trigger *trig,
diff --git a/drivers/iio/light/apds9960.c b/drivers/iio/light/apds9960.c
index b4dbb3912977..651d57b8abbf 100644
--- a/drivers/iio/light/apds9960.c
+++ b/drivers/iio/light/apds9960.c
@@ -1011,6 +1011,7 @@ static int apds9960_probe(struct i2c_client *client,
 
         iio_device_attach_buffer(indio_dev, buffer);
 
+        indio_dev->dev.parent = &client->dev;
         indio_dev->info = &apds9960_info;
         indio_dev->name = APDS9960_DRV_NAME;
         indio_dev->channels = apds9960_channels;
diff --git a/drivers/iio/light/bh1780.c b/drivers/iio/light/bh1780.c
index 72b364e4aa72..b54dcba05a82 100644
--- a/drivers/iio/light/bh1780.c
+++ b/drivers/iio/light/bh1780.c
@@ -84,7 +84,7 @@ static int bh1780_debugfs_reg_access(struct iio_dev *indio_dev,
         int ret;
 
         if (!readval)
-                bh1780_write(bh1780, (u8)reg, (u8)writeval);
+                return bh1780_write(bh1780, (u8)reg, (u8)writeval);
 
         ret = bh1780_read(bh1780, (u8)reg);
         if (ret < 0)
@@ -187,7 +187,7 @@ static int bh1780_probe(struct i2c_client *client,
 
         indio_dev->dev.parent = &client->dev;
         indio_dev->info = &bh1780_info;
-        indio_dev->name = id->name;
+        indio_dev->name = "bh1780";
         indio_dev->channels = bh1780_channels;
         indio_dev->num_channels = ARRAY_SIZE(bh1780_channels);
         indio_dev->modes = INDIO_DIRECT_MODE;
@@ -226,7 +226,8 @@ static int bh1780_remove(struct i2c_client *client)
 static int bh1780_runtime_suspend(struct device *dev)
 {
         struct i2c_client *client = to_i2c_client(dev);
-        struct bh1780_data *bh1780 = i2c_get_clientdata(client);
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+        struct bh1780_data *bh1780 = iio_priv(indio_dev);
         int ret;
 
         ret = bh1780_write(bh1780, BH1780_REG_CONTROL, BH1780_POFF);
@@ -241,7 +242,8 @@ static int bh1780_runtime_suspend(struct device *dev)
 static int bh1780_runtime_resume(struct device *dev)
 {
         struct i2c_client *client = to_i2c_client(dev);
-        struct bh1780_data *bh1780 = i2c_get_clientdata(client);
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+        struct bh1780_data *bh1780 = iio_priv(indio_dev);
         int ret;
 
         ret = bh1780_write(bh1780, BH1780_REG_CONTROL, BH1780_PON);
diff --git a/drivers/iio/light/max44000.c b/drivers/iio/light/max44000.c
index e01e58a9bd14..f17cb2ea18f5 100644
--- a/drivers/iio/light/max44000.c
+++ b/drivers/iio/light/max44000.c
@@ -147,7 +147,6 @@ static const struct iio_chan_spec max44000_channels[] = {
         {
                 .type = IIO_PROXIMITY,
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
-                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
                 .scan_index = MAX44000_SCAN_INDEX_PRX,
                 .scan_type = {
                         .sign           = 'u',
diff --git a/drivers/iio/magnetometer/st_magn_buffer.c b/drivers/iio/magnetometer/st_magn_buffer.c
index ecd3bd0a9769..0a9e8fadfa9d 100644
--- a/drivers/iio/magnetometer/st_magn_buffer.c
+++ b/drivers/iio/magnetometer/st_magn_buffer.c
@@ -82,7 +82,7 @@ static const struct iio_buffer_setup_ops st_magn_buffer_setup_ops = {
 
 int st_magn_allocate_ring(struct iio_dev *indio_dev)
 {
-        return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+        return iio_triggered_buffer_setup(indio_dev, NULL,
                 &st_sensors_trigger_handler, &st_magn_buffer_setup_ops);
 }
 
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 62036d2a9956..8250fc322c56 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -572,6 +572,7 @@ static const struct iio_info magn_info = {
 static const struct iio_trigger_ops st_magn_trigger_ops = {
         .owner = THIS_MODULE,
         .set_trigger_state = ST_MAGN_TRIGGER_SET_STATE,
+        .validate_device = st_sensors_validate_device,
 };
 #define ST_MAGN_TRIGGER_OPS (&st_magn_trigger_ops)
 #else
diff --git a/drivers/iio/pressure/bmp280.c b/drivers/iio/pressure/bmp280.c
index 2f1498e12bb2..724452d61846 100644
--- a/drivers/iio/pressure/bmp280.c
+++ b/drivers/iio/pressure/bmp280.c
@@ -879,8 +879,8 @@ static int bmp280_probe(struct i2c_client *client,
         if (ret < 0)
                 return ret;
         if (chip_id != id->driver_data) {
-                dev_err(&client->dev, "bad chip id.  expected %x got %x\n",
-                        BMP280_CHIP_ID, chip_id);
+                dev_err(&client->dev, "bad chip id.  expected %lx got %x\n",
+                        id->driver_data, chip_id);
                 return -EINVAL;
         }
 
diff --git a/drivers/iio/pressure/st_pressure_buffer.c b/drivers/iio/pressure/st_pressure_buffer.c
index 2ff53f222352..99468d0a64e7 100644
--- a/drivers/iio/pressure/st_pressure_buffer.c
+++ b/drivers/iio/pressure/st_pressure_buffer.c
@@ -82,7 +82,7 @@ static const struct iio_buffer_setup_ops st_press_buffer_setup_ops = {
 
 int st_press_allocate_ring(struct iio_dev *indio_dev)
 {
-        return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
+        return iio_triggered_buffer_setup(indio_dev, NULL,
                 &st_sensors_trigger_handler, &st_press_buffer_setup_ops);
 }
 
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index 9e9b72a8f18f..92a118c3c4ac 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -28,15 +28,21 @@
 #include <linux/iio/common/st_sensors.h>
 #include "st_pressure.h"
 
+#define MCELSIUS_PER_CELSIUS                    1000
+
+/* Default pressure sensitivity */
 #define ST_PRESS_LSB_PER_MBAR                   4096UL
 #define ST_PRESS_KPASCAL_NANO_SCALE             (100000000UL / \
                                                  ST_PRESS_LSB_PER_MBAR)
+
+/* Default temperature sensitivity */
 #define ST_PRESS_LSB_PER_CELSIUS                480UL
-#define ST_PRESS_CELSIUS_NANO_SCALE             (1000000000UL / \
-                                                 ST_PRESS_LSB_PER_CELSIUS)
+#define ST_PRESS_MILLI_CELSIUS_OFFSET           42500UL
+
 #define ST_PRESS_NUMBER_DATA_CHANNELS           1
 
 /* FULLSCALE */
+#define ST_PRESS_FS_AVL_1100MB                  1100
 #define ST_PRESS_FS_AVL_1260MB                  1260
 
 #define ST_PRESS_1_OUT_XL_ADDR                  0x28
@@ -54,9 +60,6 @@
 #define ST_PRESS_LPS331AP_PW_MASK               0x80
 #define ST_PRESS_LPS331AP_FS_ADDR               0x23
 #define ST_PRESS_LPS331AP_FS_MASK               0x30
-#define ST_PRESS_LPS331AP_FS_AVL_1260_VAL       0x00
-#define ST_PRESS_LPS331AP_FS_AVL_1260_GAIN      ST_PRESS_KPASCAL_NANO_SCALE
-#define ST_PRESS_LPS331AP_FS_AVL_TEMP_GAIN      ST_PRESS_CELSIUS_NANO_SCALE
 #define ST_PRESS_LPS331AP_BDU_ADDR              0x20
 #define ST_PRESS_LPS331AP_BDU_MASK              0x04
 #define ST_PRESS_LPS331AP_DRDY_IRQ_ADDR         0x22
@@ -67,9 +70,14 @@
 #define ST_PRESS_LPS331AP_OD_IRQ_ADDR           0x22
 #define ST_PRESS_LPS331AP_OD_IRQ_MASK           0x40
 #define ST_PRESS_LPS331AP_MULTIREAD_BIT         true
-#define ST_PRESS_LPS331AP_TEMP_OFFSET           42500
 
 /* CUSTOM VALUES FOR LPS001WP SENSOR */
+
+/* LPS001WP pressure resolution */
+#define ST_PRESS_LPS001WP_LSB_PER_MBAR          16UL
+/* LPS001WP temperature resolution */
+#define ST_PRESS_LPS001WP_LSB_PER_CELSIUS       64UL
+
 #define ST_PRESS_LPS001WP_WAI_EXP               0xba
 #define ST_PRESS_LPS001WP_ODR_ADDR              0x20
 #define ST_PRESS_LPS001WP_ODR_MASK              0x30
@@ -78,6 +86,8 @@
 #define ST_PRESS_LPS001WP_ODR_AVL_13HZ_VAL      0x03
 #define ST_PRESS_LPS001WP_PW_ADDR               0x20
 #define ST_PRESS_LPS001WP_PW_MASK               0x40
+#define ST_PRESS_LPS001WP_FS_AVL_PRESS_GAIN \
+        (100000000UL / ST_PRESS_LPS001WP_LSB_PER_MBAR)
 #define ST_PRESS_LPS001WP_BDU_ADDR              0x20
 #define ST_PRESS_LPS001WP_BDU_MASK              0x04
 #define ST_PRESS_LPS001WP_MULTIREAD_BIT         true
@@ -94,11 +104,6 @@
 #define ST_PRESS_LPS25H_ODR_AVL_25HZ_VAL        0x04
 #define ST_PRESS_LPS25H_PW_ADDR                 0x20
 #define ST_PRESS_LPS25H_PW_MASK                 0x80
-#define ST_PRESS_LPS25H_FS_ADDR                 0x00
-#define ST_PRESS_LPS25H_FS_MASK                 0x00
-#define ST_PRESS_LPS25H_FS_AVL_1260_VAL         0x00
-#define ST_PRESS_LPS25H_FS_AVL_1260_GAIN        ST_PRESS_KPASCAL_NANO_SCALE
-#define ST_PRESS_LPS25H_FS_AVL_TEMP_GAIN        ST_PRESS_CELSIUS_NANO_SCALE
 #define ST_PRESS_LPS25H_BDU_ADDR                0x20
 #define ST_PRESS_LPS25H_BDU_MASK                0x04
 #define ST_PRESS_LPS25H_DRDY_IRQ_ADDR           0x23
@@ -109,7 +114,6 @@
 #define ST_PRESS_LPS25H_OD_IRQ_ADDR             0x22
 #define ST_PRESS_LPS25H_OD_IRQ_MASK             0x40
 #define ST_PRESS_LPS25H_MULTIREAD_BIT           true
-#define ST_PRESS_LPS25H_TEMP_OFFSET             42500
 #define ST_PRESS_LPS25H_OUT_XL_ADDR             0x28
 #define ST_TEMP_LPS25H_OUT_L_ADDR               0x2b
 
@@ -161,7 +165,9 @@ static const struct iio_chan_spec st_press_lps001wp_channels[] = {
                         .storagebits = 16,
                         .endianness = IIO_LE,
                 },
-                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+                .info_mask_separate =
+                        BIT(IIO_CHAN_INFO_RAW) |
+                        BIT(IIO_CHAN_INFO_SCALE),
                 .modified = 0,
         },
         {
@@ -177,7 +183,7 @@ static const struct iio_chan_spec st_press_lps001wp_channels[] = {
                 },
                 .info_mask_separate =
                         BIT(IIO_CHAN_INFO_RAW) |
-                        BIT(IIO_CHAN_INFO_OFFSET),
+                        BIT(IIO_CHAN_INFO_SCALE),
                 .modified = 0,
         },
         IIO_CHAN_SOFT_TIMESTAMP(1)
@@ -212,11 +218,14 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                         .addr = ST_PRESS_LPS331AP_FS_ADDR,
                         .mask = ST_PRESS_LPS331AP_FS_MASK,
                         .fs_avl = {
+                                /*
+                                 * Pressure and temperature sensitivity values
+                                 * as defined in table 3 of LPS331AP datasheet.
+                                 */
                                 [0] = {
                                         .num = ST_PRESS_FS_AVL_1260MB,
-                                        .value = ST_PRESS_LPS331AP_FS_AVL_1260_VAL,
-                                        .gain = ST_PRESS_LPS331AP_FS_AVL_1260_GAIN,
-                                        .gain2 = ST_PRESS_LPS331AP_FS_AVL_TEMP_GAIN,
+                                        .gain = ST_PRESS_KPASCAL_NANO_SCALE,
+                                        .gain2 = ST_PRESS_LSB_PER_CELSIUS,
                                 },
                         },
                 },
@@ -261,7 +270,17 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
                 .fs = {
-                        .addr = 0,
+                        .fs_avl = {
+                                /*
+                                 * Pressure and temperature resolution values
+                                 * as defined in table 3 of LPS001WP datasheet.
+                                 */
+                                [0] = {
+                                        .num = ST_PRESS_FS_AVL_1100MB,
+                                        .gain = ST_PRESS_LPS001WP_FS_AVL_PRESS_GAIN,
+                                        .gain2 = ST_PRESS_LPS001WP_LSB_PER_CELSIUS,
+                                },
+                        },
                 },
                 .bdu = {
                         .addr = ST_PRESS_LPS001WP_BDU_ADDR,
@@ -298,14 +317,15 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
                 .fs = {
-                        .addr = ST_PRESS_LPS25H_FS_ADDR,
-                        .mask = ST_PRESS_LPS25H_FS_MASK,
                         .fs_avl = {
+                                /*
+                                 * Pressure and temperature sensitivity values
+                                 * as defined in table 3 of LPS25H datasheet.
+                                 */
                                 [0] = {
                                         .num = ST_PRESS_FS_AVL_1260MB,
-                                        .value = ST_PRESS_LPS25H_FS_AVL_1260_VAL,
-                                        .gain = ST_PRESS_LPS25H_FS_AVL_1260_GAIN,
-                                        .gain2 = ST_PRESS_LPS25H_FS_AVL_TEMP_GAIN,
+                                        .gain = ST_PRESS_KPASCAL_NANO_SCALE,
+                                        .gain2 = ST_PRESS_LSB_PER_CELSIUS,
                                 },
                         },
                 },
@@ -364,26 +384,26 @@ static int st_press_read_raw(struct iio_dev *indio_dev,
 
                 return IIO_VAL_INT;
         case IIO_CHAN_INFO_SCALE:
-                *val = 0;
-
                 switch (ch->type) {
                 case IIO_PRESSURE:
+                        *val = 0;
                         *val2 = press_data->current_fullscale->gain;
-                        break;
+                        return IIO_VAL_INT_PLUS_NANO;
                 case IIO_TEMP:
+                        *val = MCELSIUS_PER_CELSIUS;
                         *val2 = press_data->current_fullscale->gain2;
-                        break;
+                        return IIO_VAL_FRACTIONAL;
                 default:
                         err = -EINVAL;
                         goto read_error;
                 }
 
-                return IIO_VAL_INT_PLUS_NANO;
         case IIO_CHAN_INFO_OFFSET:
                 switch (ch->type) {
                 case IIO_TEMP:
-                        *val = 425;
-                        *val2 = 10;
+                        *val = ST_PRESS_MILLI_CELSIUS_OFFSET *
+                               press_data->current_fullscale->gain2;
+                        *val2 = MCELSIUS_PER_CELSIUS;
                         break;
                 default:
                         err = -EINVAL;
@@ -425,6 +445,7 @@ static const struct iio_info press_info = {
 static const struct iio_trigger_ops st_press_trigger_ops = {
         .owner = THIS_MODULE,
         .set_trigger_state = ST_PRESS_TRIGGER_SET_STATE,
+        .validate_device = st_sensors_validate_device,
 };
 #define ST_PRESS_TRIGGER_OPS (&st_press_trigger_ops)
 #else
diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
index f4d29d5dbd5f..e2f926cdcad2 100644
--- a/drivers/iio/proximity/as3935.c
+++ b/drivers/iio/proximity/as3935.c
@@ -64,6 +64,7 @@ struct as3935_state {
         struct delayed_work work;
 
         u32 tune_cap;
+        u8 buffer[16]; /* 8-bit data + 56-bit padding + 64-bit timestamp */
         u8 buf[2] ____cacheline_aligned;
 };
 
@@ -72,7 +73,8 @@ static const struct iio_chan_spec as3935_channels[] = {
                 .type           = IIO_PROXIMITY,
                 .info_mask_separate =
                         BIT(IIO_CHAN_INFO_RAW) |
-                        BIT(IIO_CHAN_INFO_PROCESSED),
+                        BIT(IIO_CHAN_INFO_PROCESSED) |
+                        BIT(IIO_CHAN_INFO_SCALE),
                 .scan_index     = 0,
                 .scan_type = {
                         .sign           = 'u',
@@ -181,7 +183,12 @@ static int as3935_read_raw(struct iio_dev *indio_dev,
                 /* storm out of range */
                 if (*val == AS3935_DATA_MASK)
                         return -EINVAL;
-                *val *= 1000;
+
+                if (m == IIO_CHAN_INFO_PROCESSED)
+                        *val *= 1000;
+                break;
+        case IIO_CHAN_INFO_SCALE:
+                *val = 1000;
                 break;
         default:
                 return -EINVAL;
@@ -206,10 +213,10 @@ static irqreturn_t as3935_trigger_handler(int irq, void *private)
         ret = as3935_read(st, AS3935_DATA, &val);
         if (ret)
                 goto err_read;
-        val &= AS3935_DATA_MASK;
-        val *= 1000;
 
-        iio_push_to_buffers_with_timestamp(indio_dev, &val, pf->timestamp);
+        st->buffer[0] = val & AS3935_DATA_MASK;
+        iio_push_to_buffers_with_timestamp(indio_dev, &st->buffer,
+                                           pf->timestamp);
 err_read:
         iio_trigger_notify_done(indio_dev->trig);
 
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index 94b68213c50d..5f6b3bcab078 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -1941,6 +1941,7 @@ static struct iommu_ops arm_smmu_ops = {
         .attach_dev             = arm_smmu_attach_dev,
         .map                    = arm_smmu_map,
         .unmap                  = arm_smmu_unmap,
+        .map_sg                 = default_iommu_map_sg,
         .iova_to_phys           = arm_smmu_iova_to_phys,
         .add_device             = arm_smmu_add_device,
         .remove_device          = arm_smmu_remove_device,
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index a644d0cec2d8..10700945994e 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3222,11 +3222,6 @@ static int __init init_dmars(void)
                         }
                 }
 
-                iommu_flush_write_buffer(iommu);
-                iommu_set_root_entry(iommu);
-                iommu->flush.flush_context(iommu, 0, 0, 0, DMA_CCMD_GLOBAL_INVL);
-                iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);
-
                 if (!ecap_pass_through(iommu->ecap))
                         hw_pass_through = 0;
 #ifdef CONFIG_INTEL_IOMMU_SVM
@@ -3235,6 +3230,18 @@ static int __init init_dmars(void)
 #endif
         }
 
+        /*
+         * Now that qi is enabled on all iommus, set the root entry and flush
+         * caches. This is required on some Intel X58 chipsets, otherwise the
+         * flush_context function will loop forever and the boot hangs.
+         */
+        for_each_active_iommu(iommu, drhd) {
+                iommu_flush_write_buffer(iommu);
+                iommu_set_root_entry(iommu);
+                iommu->flush.flush_context(iommu, 0, 0, 0, DMA_CCMD_GLOBAL_INVL);
+                iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);
+        }
+
         if (iommu_pass_through)
                 iommu_identity_mapping |= IDENTMAP_ALL;
 
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index c7d6156ff536..25b4627cb57f 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -815,7 +815,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain,
         dte_addr = virt_to_phys(rk_domain->dt);
         for (i = 0; i < iommu->num_mmu; i++) {
                 rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR, dte_addr);
-                rk_iommu_command(iommu->bases[i], RK_MMU_CMD_ZAP_CACHE);
+                rk_iommu_base_command(iommu->bases[i], RK_MMU_CMD_ZAP_CACHE);
                 rk_iommu_write(iommu->bases[i], RK_MMU_INT_MASK, RK_MMU_IRQ_MASK);
         }
 
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index 3495d5d6547f..3bce44893021 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -53,11 +53,12 @@ static void led_timer_function(unsigned long data)
 
         if (!led_cdev->blink_delay_on || !led_cdev->blink_delay_off) {
                 led_set_brightness_nosleep(led_cdev, LED_OFF);
+                led_cdev->flags &= ~LED_BLINK_SW;
                 return;
         }
 
         if (led_cdev->flags & LED_BLINK_ONESHOT_STOP) {
-                led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;
+                led_cdev->flags &=  ~(LED_BLINK_ONESHOT_STOP | LED_BLINK_SW);
                 return;
         }
 
@@ -151,6 +152,7 @@ static void led_set_software_blink(struct led_classdev *led_cdev,
                 return;
         }
 
+        led_cdev->flags |= LED_BLINK_SW;
         mod_timer(&led_cdev->blink_timer, jiffies + 1);
 }
 
@@ -219,6 +221,7 @@ void led_stop_software_blink(struct led_classdev *led_cdev)
         del_timer_sync(&led_cdev->blink_timer);
         led_cdev->blink_delay_on = 0;
         led_cdev->blink_delay_off = 0;
+        led_cdev->flags &= ~LED_BLINK_SW;
 }
 EXPORT_SYMBOL_GPL(led_stop_software_blink);
 
@@ -226,10 +229,10 @@ void led_set_brightness(struct led_classdev *led_cdev,
                         enum led_brightness brightness)
 {
         /*
-         * In case blinking is on delay brightness setting
+         * If software blink is active, delay brightness setting
          * until the next timer tick.
          */
-        if (led_cdev->blink_delay_on || led_cdev->blink_delay_off) {
+        if (led_cdev->flags & LED_BLINK_SW) {
                 /*
                  * If we need to disable soft blinking delegate this to the
                  * work queue task to avoid problems in case we are called
diff --git a/drivers/leds/trigger/ledtrig-heartbeat.c b/drivers/leds/trigger/ledtrig-heartbeat.c
index 410c39c62dc7..c9f386213e9e 100644
--- a/drivers/leds/trigger/ledtrig-heartbeat.c
+++ b/drivers/leds/trigger/ledtrig-heartbeat.c
@@ -19,6 +19,7 @@
 #include <linux/sched.h>
 #include <linux/leds.h>
 #include <linux/reboot.h>
+#include <linux/suspend.h>
 #include "../leds.h"
 
 static int panic_heartbeats;
@@ -154,6 +155,30 @@ static struct led_trigger heartbeat_led_trigger = {
         .deactivate = heartbeat_trig_deactivate,
 };
 
+static int heartbeat_pm_notifier(struct notifier_block *nb,
+                                 unsigned long pm_event, void *unused)
+{
+        int rc;
+
+        switch (pm_event) {
+        case PM_SUSPEND_PREPARE:
+        case PM_HIBERNATION_PREPARE:
+        case PM_RESTORE_PREPARE:
+                led_trigger_unregister(&heartbeat_led_trigger);
+                break;
+        case PM_POST_SUSPEND:
+        case PM_POST_HIBERNATION:
+        case PM_POST_RESTORE:
+                rc = led_trigger_register(&heartbeat_led_trigger);
+                if (rc)
+                        pr_err("could not re-register heartbeat trigger\n");
+                break;
+        default:
+                break;
+        }
+        return NOTIFY_DONE;
+}
+
 static int heartbeat_reboot_notifier(struct notifier_block *nb,
                                      unsigned long code, void *unused)
 {
@@ -168,6 +193,10 @@ static int heartbeat_panic_notifier(struct notifier_block *nb,
         return NOTIFY_DONE;
 }
 
+static struct notifier_block heartbeat_pm_nb = {
+        .notifier_call = heartbeat_pm_notifier,
+};
+
 static struct notifier_block heartbeat_reboot_nb = {
         .notifier_call = heartbeat_reboot_notifier,
 };
@@ -184,12 +213,14 @@ static int __init heartbeat_trig_init(void)
                 atomic_notifier_chain_register(&panic_notifier_list,
                                                &heartbeat_panic_nb);
                 register_reboot_notifier(&heartbeat_reboot_nb);
+                register_pm_notifier(&heartbeat_pm_nb);
         }
         return rc;
 }
 
 static void __exit heartbeat_trig_exit(void)
 {
+        unregister_pm_notifier(&heartbeat_pm_nb);
         unregister_reboot_notifier(&heartbeat_reboot_nb);
         atomic_notifier_chain_unregister(&panic_notifier_list,
                                          &heartbeat_panic_nb);
diff --git a/drivers/mcb/mcb-core.c b/drivers/mcb/mcb-core.c
index b73c6e7d28e4..6f2c8522e14a 100644
--- a/drivers/mcb/mcb-core.c
+++ b/drivers/mcb/mcb-core.c
@@ -61,21 +61,36 @@ static int mcb_probe(struct device *dev)
         struct mcb_driver *mdrv = to_mcb_driver(dev->driver);
         struct mcb_device *mdev = to_mcb_device(dev);
         const struct mcb_device_id *found_id;
+        struct module *carrier_mod;
+        int ret;
 
         found_id = mcb_match_id(mdrv->id_table, mdev);
         if (!found_id)
                 return -ENODEV;
 
-        return mdrv->probe(mdev, found_id);
+        carrier_mod = mdev->dev.parent->driver->owner;
+        if (!try_module_get(carrier_mod))
+                return -EINVAL;
+
+        get_device(dev);
+        ret = mdrv->probe(mdev, found_id);
+        if (ret)
+                module_put(carrier_mod);
+
+        return ret;
 }
 
 static int mcb_remove(struct device *dev)
 {
         struct mcb_driver *mdrv = to_mcb_driver(dev->driver);
         struct mcb_device *mdev = to_mcb_device(dev);
+        struct module *carrier_mod;
 
         mdrv->remove(mdev);
 
+        carrier_mod = mdev->dev.parent->driver->owner;
+        module_put(carrier_mod);
+
         put_device(&mdev->dev);
 
         return 0;
diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c
index ca94bded3386..8bef4331bd51 100644
--- a/drivers/media/v4l2-core/v4l2-mc.c
+++ b/drivers/media/v4l2-core/v4l2-mc.c
@@ -1,7 +1,7 @@
 /*
  * Media Controller ancillary functions
  *
- * Copyright (c) 2016 Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+ * Copyright (c) 2016 Mauro Carvalho Chehab <mchehab@kernel.org>
  * Copyright (C) 2016 Shuah Khan <shuahkh@osg.samsung.com>
  * Copyright (C) 2006-2010 Nokia Corporation
  * Copyright (c) 2016 Intel Corporation.
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index eed254da63a8..641c1a566687 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -730,7 +730,7 @@ static void mei_cl_wake_all(struct mei_cl *cl)
         /* synchronized under device mutex */
         if (waitqueue_active(&cl->wait)) {
                 cl_dbg(dev, cl, "Waking up ctrl write clients!\n");
-                wake_up_interruptible(&cl->wait);
+                wake_up(&cl->wait);
         }
 }
 
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 16baeb51b2bd..ef3618299494 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -1147,11 +1147,17 @@ int ubi_detach_mtd_dev(int ubi_num, int anyway)
  */
 static struct mtd_info * __init open_mtd_by_chdev(const char *mtd_dev)
 {
-        struct kstat stat;
         int err, minor;
+        struct path path;
+        struct kstat stat;
 
         /* Probably this is an MTD character device node path */
-        err = vfs_stat(mtd_dev, &stat);
+        err = kern_path(mtd_dev, LOOKUP_FOLLOW, &path);
+        if (err)
+                return ERR_PTR(err);
+
+        err = vfs_getattr(&path, &stat);
+        path_put(&path);
         if (err)
                 return ERR_PTR(err);
 
@@ -1160,6 +1166,7 @@ static struct mtd_info * __init open_mtd_by_chdev(const char *mtd_dev)
                 return ERR_PTR(-EINVAL);
 
         minor = MINOR(stat.rdev);
+
         if (minor & 1)
                 /*
                  * Just do not think the "/dev/mtdrX" devices support is need,
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index 348dbbcbedc8..a9e2cef7c95c 100644
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -302,6 +302,7 @@ EXPORT_SYMBOL_GPL(ubi_open_volume_nm);
 struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode)
 {
         int error, ubi_num, vol_id;
+        struct path path;
         struct kstat stat;
 
         dbg_gen("open volume %s, mode %d", pathname, mode);
@@ -309,7 +310,12 @@ struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode)
         if (!pathname || !*pathname)
                 return ERR_PTR(-EINVAL);
 
-        error = vfs_stat(pathname, &stat);
+        error = kern_path(pathname, LOOKUP_FOLLOW, &path);
+        if (error)
+                return ERR_PTR(error);
+
+        error = vfs_getattr(&path, &stat);
+        path_put(&path);
         if (error)
                 return ERR_PTR(error);
 
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index 1b8304e1efaa..140436a046c0 100644
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -1010,8 +1010,8 @@ int arm_pmu_device_probe(struct platform_device *pdev,
                 if (!ret)
                         ret = init_fn(pmu);
         } else {
-                ret = probe_current_pmu(pmu, probe_table);
                 cpumask_setall(&pmu->supported_cpus);
+                ret = probe_current_pmu(pmu, probe_table);
         }
 
         if (ret) {
diff --git a/drivers/phy/phy-exynos-mipi-video.c b/drivers/phy/phy-exynos-mipi-video.c
index cc093ebfda94..8b851f718123 100644
--- a/drivers/phy/phy-exynos-mipi-video.c
+++ b/drivers/phy/phy-exynos-mipi-video.c
@@ -233,8 +233,12 @@ static inline int __is_running(const struct exynos_mipi_phy_desc *data,
                         struct exynos_mipi_video_phy *state)
 {
         u32 val;
+        int ret;
+
+        ret = regmap_read(state->regmaps[data->resetn_map], data->resetn_reg, &val);
+        if (ret)
+                return 0;
 
-        regmap_read(state->regmaps[data->resetn_map], data->resetn_reg, &val);
         return val & data->resetn_val;
 }
 
diff --git a/drivers/phy/phy-ti-pipe3.c b/drivers/phy/phy-ti-pipe3.c
index 0a477d24cf76..bf46844dc387 100644
--- a/drivers/phy/phy-ti-pipe3.c
+++ b/drivers/phy/phy-ti-pipe3.c
@@ -293,11 +293,18 @@ static int ti_pipe3_init(struct phy *x)
                 ret = ti_pipe3_dpll_wait_lock(phy);
         }
 
-        /* Program the DPLL only if not locked */
+        /* SATA has issues if re-programmed when locked */
         val = ti_pipe3_readl(phy->pll_ctrl_base, PLL_STATUS);
-        if (!(val & PLL_LOCK))
-                if (ti_pipe3_dpll_program(phy))
-                        return -EINVAL;
+        if ((val & PLL_LOCK) && of_device_is_compatible(phy->dev->of_node,
+                                                        "ti,phy-pipe3-sata"))
+                return ret;
+
+        /* Program the DPLL */
+        ret = ti_pipe3_dpll_program(phy);
+        if (ret) {
+                ti_pipe3_disable_clocks(phy);
+                return -EINVAL;
+        }
 
         return ret;
 }
diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
index 6b6af6cba454..d9b10a39a2cf 100644
--- a/drivers/phy/phy-twl4030-usb.c
+++ b/drivers/phy/phy-twl4030-usb.c
@@ -463,7 +463,8 @@ static int twl4030_phy_power_on(struct phy *phy)
         twl4030_usb_set_mode(twl, twl->usb_mode);
         if (twl->usb_mode == T2_USB_MODE_ULPI)
                 twl4030_i2c_access(twl, 0);
-        schedule_delayed_work(&twl->id_workaround_work, 0);
+        twl->linkstat = MUSB_UNKNOWN;
+        schedule_delayed_work(&twl->id_workaround_work, HZ);
 
         return 0;
 }
@@ -537,6 +538,7 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
         struct twl4030_usb *twl = _twl;
         enum musb_vbus_id_status status;
         bool status_changed = false;
+        int err;
 
         status = twl4030_usb_linkstat(twl);
 
@@ -567,7 +569,9 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
                         pm_runtime_mark_last_busy(twl->dev);
                         pm_runtime_put_autosuspend(twl->dev);
                 }
-                musb_mailbox(status);
+                err = musb_mailbox(status);
+                if (err)
+                        twl->linkstat = MUSB_UNKNOWN;
         }
 
         /* don't schedule during sleep - irq works right then */
@@ -595,7 +599,8 @@ static int twl4030_phy_init(struct phy *phy)
         struct twl4030_usb *twl = phy_get_drvdata(phy);
 
         pm_runtime_get_sync(twl->dev);
-        schedule_delayed_work(&twl->id_workaround_work, 0);
+        twl->linkstat = MUSB_UNKNOWN;
+        schedule_delayed_work(&twl->id_workaround_work, HZ);
         pm_runtime_mark_last_busy(twl->dev);
         pm_runtime_put_autosuspend(twl->dev);
 
@@ -763,7 +768,8 @@ static int twl4030_usb_remove(struct platform_device *pdev)
         if (cable_present(twl->linkstat))
                 pm_runtime_put_noidle(twl->dev);
         pm_runtime_mark_last_busy(twl->dev);
-        pm_runtime_put_sync_suspend(twl->dev);
+        pm_runtime_dont_use_autosuspend(&pdev->dev);
+        pm_runtime_put_sync(twl->dev);
         pm_runtime_disable(twl->dev);
 
         /* autogate 60MHz ULPI clock,
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index c06bb85c2839..3ec0025d19e7 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -103,7 +103,6 @@ config DELL_SMBIOS
 
 config DELL_LAPTOP
         tristate "Dell Laptop Extras"
-        depends on X86
         depends on DELL_SMBIOS
         depends on DMI
         depends on BACKLIGHT_CLASS_DEVICE
@@ -505,7 +504,7 @@ config THINKPAD_ACPI_HOTKEY_POLL
 
 config SENSORS_HDAPS
         tristate "Thinkpad Hard Drive Active Protection System (hdaps)"
-        depends on INPUT && X86
+        depends on INPUT
         select INPUT_POLLDEV
         default n
         help
@@ -749,7 +748,7 @@ config TOSHIBA_WMI
 
 config ACPI_CMPC
         tristate "CMPC Laptop Extras"
-        depends on X86 && ACPI
+        depends on ACPI
         depends on RFKILL || RFKILL=n
         select INPUT
         select BACKLIGHT_CLASS_DEVICE
@@ -848,7 +847,7 @@ config INTEL_IMR
 
 config INTEL_PMC_CORE
         bool "Intel PMC Core driver"
-        depends on X86 && PCI
+        depends on PCI
         ---help---
           The Intel Platform Controller Hub for Intel Core SoCs provides access
           to Power Management Controller registers via a PCI interface. This
@@ -860,7 +859,7 @@ config INTEL_PMC_CORE
 
 config IBM_RTL
         tristate "Device driver to enable PRTL support"
-        depends on X86 && PCI
+        depends on PCI
         ---help---
          Enable support for IBM Premium Real Time Mode (PRTM).
          This module will allow you the enter and exit PRTM in the BIOS via
@@ -894,7 +893,6 @@ config XO15_EBOOK
 
 config SAMSUNG_LAPTOP
         tristate "Samsung Laptop driver"
-        depends on X86
         depends on RFKILL || RFKILL = n
         depends on ACPI_VIDEO || ACPI_VIDEO = n
         depends on BACKLIGHT_CLASS_DEVICE
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 4a23fbc66b71..d1a091b93192 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -567,6 +567,7 @@ static void ideapad_sysfs_exit(struct ideapad_private *priv)
 static const struct key_entry ideapad_keymap[] = {
         { KE_KEY, 6,  { KEY_SWITCHVIDEOMODE } },
         { KE_KEY, 7,  { KEY_CAMERA } },
+        { KE_KEY, 8,  { KEY_MICMUTE } },
         { KE_KEY, 11, { KEY_F16 } },
         { KE_KEY, 13, { KEY_WLAN } },
         { KE_KEY, 16, { KEY_PROG1 } },
@@ -809,6 +810,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)
                                 break;
                         case 13:
                         case 11:
+                        case 8:
                         case 7:
                         case 6:
                                 ideapad_input_report(priv, vpc_bit);
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index c3bfa1fe95bf..b65ce7519411 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -2043,6 +2043,7 @@ static int hotkey_autosleep_ack;
 
 static u32 hotkey_orig_mask;            /* events the BIOS had enabled */
 static u32 hotkey_all_mask;             /* all events supported in fw */
+static u32 hotkey_adaptive_all_mask;    /* all adaptive events supported in fw */
 static u32 hotkey_reserved_mask;        /* events better left disabled */
 static u32 hotkey_driver_mask;          /* events needed by the driver */
 static u32 hotkey_user_mask;            /* events visible to userspace */
@@ -2742,6 +2743,17 @@ static ssize_t hotkey_all_mask_show(struct device *dev,
 
 static DEVICE_ATTR_RO(hotkey_all_mask);
 
+/* sysfs hotkey all_mask ----------------------------------------------- */
+static ssize_t hotkey_adaptive_all_mask_show(struct device *dev,
+                           struct device_attribute *attr,
+                           char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "0x%08x\n",
+                        hotkey_adaptive_all_mask | hotkey_source_mask);
+}
+
+static DEVICE_ATTR_RO(hotkey_adaptive_all_mask);
+
 /* sysfs hotkey recommended_mask --------------------------------------- */
 static ssize_t hotkey_recommended_mask_show(struct device *dev,
                                             struct device_attribute *attr,
@@ -2985,6 +2997,7 @@ static struct attribute *hotkey_attributes[] __initdata = {
         &dev_attr_wakeup_hotunplug_complete.attr,
         &dev_attr_hotkey_mask.attr,
         &dev_attr_hotkey_all_mask.attr,
+        &dev_attr_hotkey_adaptive_all_mask.attr,
         &dev_attr_hotkey_recommended_mask.attr,
 #ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
         &dev_attr_hotkey_source_mask.attr,
@@ -3321,20 +3334,6 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
         if (!tp_features.hotkey)
                 return 1;
 
-        /*
-         * Check if we have an adaptive keyboard, like on the
-         * Lenovo Carbon X1 2014 (2nd Gen).
-         */
-        if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) {
-                if ((hkeyv >> 8) == 2) {
-                        tp_features.has_adaptive_kbd = true;
-                        res = sysfs_create_group(&tpacpi_pdev->dev.kobj,
-                                        &adaptive_kbd_attr_group);
-                        if (res)
-                                goto err_exit;
-                }
-        }
-
         quirks = tpacpi_check_quirks(tpacpi_hotkey_qtable,
                                      ARRAY_SIZE(tpacpi_hotkey_qtable));
 
@@ -3357,30 +3356,70 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
            A30, R30, R31, T20-22, X20-21, X22-24.  Detected by checking
            for HKEY interface version 0x100 */
         if (acpi_evalf(hkey_handle, &hkeyv, "MHKV", "qd")) {
-                if ((hkeyv >> 8) != 1) {
-                        pr_err("unknown version of the HKEY interface: 0x%x\n",
-                               hkeyv);
-                        pr_err("please report this to %s\n", TPACPI_MAIL);
-                } else {
+                vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_HKEY,
+                            "firmware HKEY interface version: 0x%x\n",
+                            hkeyv);
+
+                switch (hkeyv >> 8) {
+                case 1:
                         /*
                          * MHKV 0x100 in A31, R40, R40e,
                          * T4x, X31, and later
                          */
-                        vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_HKEY,
-                                "firmware HKEY interface version: 0x%x\n",
-                                hkeyv);
 
                         /* Paranoia check AND init hotkey_all_mask */
                         if (!acpi_evalf(hkey_handle, &hotkey_all_mask,
                                         "MHKA", "qd")) {
-                                pr_err("missing MHKA handler, "
-                                       "please report this to %s\n",
+                                pr_err("missing MHKA handler, please report this to %s\n",
                                        TPACPI_MAIL);
                                 /* Fallback: pre-init for FN+F3,F4,F12 */
                                 hotkey_all_mask = 0x080cU;
                         } else {
                                 tp_features.hotkey_mask = 1;
                         }
+                        break;
+
+                case 2:
+                        /*
+                         * MHKV 0x200 in X1, T460s, X260, T560, X1 Tablet (2016)
+                         */
+
+                        /* Paranoia check AND init hotkey_all_mask */
+                        if (!acpi_evalf(hkey_handle, &hotkey_all_mask,
+                                        "MHKA", "dd", 1)) {
+                                pr_err("missing MHKA handler, please report this to %s\n",
+                                       TPACPI_MAIL);
+                                /* Fallback: pre-init for FN+F3,F4,F12 */
+                                hotkey_all_mask = 0x080cU;
+                        } else {
+                                tp_features.hotkey_mask = 1;
+                        }
+
+                        /*
+                         * Check if we have an adaptive keyboard, like on the
+                         * Lenovo Carbon X1 2014 (2nd Gen).
+                         */
+                        if (acpi_evalf(hkey_handle, &hotkey_adaptive_all_mask,
+                                       "MHKA", "dd", 2)) {
+                                if (hotkey_adaptive_all_mask != 0) {
+                                        tp_features.has_adaptive_kbd = true;
+                                        res = sysfs_create_group(
+                                                &tpacpi_pdev->dev.kobj,
+                                                &adaptive_kbd_attr_group);
+                                        if (res)
+                                                goto err_exit;
+                                }
+                        } else {
+                                tp_features.has_adaptive_kbd = false;
+                                hotkey_adaptive_all_mask = 0x0U;
+                        }
+                        break;
+
+                default:
+                        pr_err("unknown version of the HKEY interface: 0x%x\n",
+                               hkeyv);
+                        pr_err("please report this to %s\n", TPACPI_MAIL);
+                        break;
                 }
         }
 
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index dba3843c53b8..ed337a8c34ab 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -457,7 +457,8 @@ int pwm_apply_state(struct pwm_device *pwm, struct pwm_state *state)
 {
         int err;
 
-        if (!pwm)
+        if (!pwm || !state || !state->period ||
+            state->duty_cycle > state->period)
                 return -EINVAL;
 
         if (!memcmp(state, &pwm->state, sizeof(*state)))
diff --git a/drivers/pwm/pwm-atmel-hlcdc.c b/drivers/pwm/pwm-atmel-hlcdc.c
index f994c7eaf41c..14fc011faa32 100644
--- a/drivers/pwm/pwm-atmel-hlcdc.c
+++ b/drivers/pwm/pwm-atmel-hlcdc.c
@@ -272,7 +272,7 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev)
         chip->chip.of_pwm_n_cells = 3;
         chip->chip.can_sleep = 1;
 
-        ret = pwmchip_add(&chip->chip);
+        ret = pwmchip_add_with_polarity(&chip->chip, PWM_POLARITY_INVERSED);
         if (ret) {
                 clk_disable_unprepare(hlcdc->periph_clk);
                 return ret;
diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c
index d98599249a05..01695d48dd54 100644
--- a/drivers/pwm/sysfs.c
+++ b/drivers/pwm/sysfs.c
@@ -152,7 +152,7 @@ static ssize_t enable_store(struct device *child,
                 goto unlock;
         }
 
-        pwm_apply_state(pwm, &state);
+        ret = pwm_apply_state(pwm, &state);
 
 unlock:
         mutex_unlock(&export->lock);
diff --git a/drivers/regulator/qcom_smd-regulator.c b/drivers/regulator/qcom_smd-regulator.c
index 56a17ec5b5ef..526bf23dcb49 100644
--- a/drivers/regulator/qcom_smd-regulator.c
+++ b/drivers/regulator/qcom_smd-regulator.c
@@ -140,6 +140,19 @@ static const struct regulator_ops rpm_smps_ldo_ops = {
         .enable = rpm_reg_enable,
         .disable = rpm_reg_disable,
         .is_enabled = rpm_reg_is_enabled,
+        .list_voltage = regulator_list_voltage_linear_range,
+
+        .get_voltage = rpm_reg_get_voltage,
+        .set_voltage = rpm_reg_set_voltage,
+
+        .set_load = rpm_reg_set_load,
+};
+
+static const struct regulator_ops rpm_smps_ldo_ops_fixed = {
+        .enable = rpm_reg_enable,
+        .disable = rpm_reg_disable,
+        .is_enabled = rpm_reg_is_enabled,
+        .list_voltage = regulator_list_voltage_linear_range,
 
         .get_voltage = rpm_reg_get_voltage,
         .set_voltage = rpm_reg_set_voltage,
@@ -247,7 +260,7 @@ static const struct regulator_desc pm8941_nldo = {
 static const struct regulator_desc pm8941_lnldo = {
         .fixed_uV = 1740000,
         .n_voltages = 1,
-        .ops = &rpm_smps_ldo_ops,
+        .ops = &rpm_smps_ldo_ops_fixed,
 };
 
 static const struct regulator_desc pm8941_switch = {
diff --git a/drivers/regulator/tps51632-regulator.c b/drivers/regulator/tps51632-regulator.c
index 572816e30095..c139890c1514 100644
--- a/drivers/regulator/tps51632-regulator.c
+++ b/drivers/regulator/tps51632-regulator.c
@@ -94,11 +94,14 @@ static int tps51632_dcdc_set_ramp_delay(struct regulator_dev *rdev,
                 int ramp_delay)
 {
         struct tps51632_chip *tps = rdev_get_drvdata(rdev);
-        int bit = ramp_delay/6000;
+        int bit;
         int ret;
 
-        if (bit)
-                bit--;
+        if (ramp_delay == 0)
+                bit = 0;
+        else
+                bit = DIV_ROUND_UP(ramp_delay, 6000) - 1;
+
         ret = regmap_write(tps->regmap, TPS51632_SLEW_REGS, BIT(bit));
         if (ret < 0)
                 dev_err(tps->dev, "SLEW reg write failed, err %d\n", ret);
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
index bbfee53cfcf5..845e49a52430 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -2521,12 +2521,13 @@ kiblnd_passive_connect(struct rdma_cm_id *cmid, void *priv, int priv_nob)
         return 0;
 
  failed:
-        if (ni)
+        if (ni) {
                 lnet_ni_decref(ni);
+                rej.ibr_cp.ibcp_queue_depth = kiblnd_msg_queue_size(version, ni);
+                rej.ibr_cp.ibcp_max_frags = kiblnd_rdma_frags(version, ni);
+        }
 
         rej.ibr_version             = version;
-        rej.ibr_cp.ibcp_queue_depth = kiblnd_msg_queue_size(version, ni);
-        rej.ibr_cp.ibcp_max_frags = kiblnd_rdma_frags(version, ni);
         kiblnd_reject(cmid, &rej);
 
         return -ECONNREFUSED;
diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index c17870cddb5b..fbce1f7e68ca 100644
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -102,7 +102,7 @@ efuse_phymap_to_logical(u8 *phymap, u16 _offset, u16 _size_byte, u8  *pbuf)
         if (!efuseTbl)
                 return;
 
-        eFuseWord = (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(*eFuseWord));
+        eFuseWord = (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16));
         if (!eFuseWord) {
                 DBG_88E("%s: alloc eFuseWord fail!\n", __func__);
                 goto eFuseWord_failed;
diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 87ea3b844951..363f3a34ddce 100644
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -2072,7 +2072,8 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
 {
         struct hal_ops  *halfunc = &adapt->HalFunc;
 
-        adapt->HalData = kzalloc(sizeof(*adapt->HalData), GFP_KERNEL);
+
+        adapt->HalData = kzalloc(sizeof(struct hal_data_8188e), GFP_KERNEL);
         if (!adapt->HalData)
                 DBG_88E("cant not alloc memory for HAL DATA\n");
 
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 6dc810bce295..944a6dca0fcb 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -44,6 +44,9 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* Creative SB Audigy 2 NX */
         { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
 
+        /* USB3503 */
+        { USB_DEVICE(0x0424, 0x3503), .driver_info = USB_QUIRK_RESET_RESUME },
+
         /* Microsoft Wireless Laser Mouse 6000 Receiver */
         { USB_DEVICE(0x045e, 0x00e1), .driver_info = USB_QUIRK_RESET_RESUME },
 
@@ -173,6 +176,10 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* MAYA44USB sound device */
         { USB_DEVICE(0x0a92, 0x0091), .driver_info = USB_QUIRK_RESET_RESUME },
 
+        /* ASUS Base Station(T100) */
+        { USB_DEVICE(0x0b05, 0x17e0), .driver_info =
+                        USB_QUIRK_IGNORE_REMOTE_WAKEUP },
+
         /* Action Semiconductor flash disk */
         { USB_DEVICE(0x10d6, 0x2200), .driver_info =
                         USB_QUIRK_STRING_FETCH_255 },
@@ -188,26 +195,22 @@ static const struct usb_device_id usb_quirk_list[] = {
         { USB_DEVICE(0x1908, 0x1315), .driver_info =
                         USB_QUIRK_HONOR_BNUMINTERFACES },
 
-        /* INTEL VALUE SSD */
-        { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
-
-        /* USB3503 */
-        { USB_DEVICE(0x0424, 0x3503), .driver_info = USB_QUIRK_RESET_RESUME },
-
-        /* ASUS Base Station(T100) */
-        { USB_DEVICE(0x0b05, 0x17e0), .driver_info =
-                        USB_QUIRK_IGNORE_REMOTE_WAKEUP },
-
         /* Protocol and OTG Electrical Test Device */
         { USB_DEVICE(0x1a0a, 0x0200), .driver_info =
                         USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL },
 
+        /* Acer C120 LED Projector */
+        { USB_DEVICE(0x1de1, 0xc102), .driver_info = USB_QUIRK_NO_LPM },
+
         /* Blackmagic Design Intensity Shuttle */
         { USB_DEVICE(0x1edb, 0xbd3b), .driver_info = USB_QUIRK_NO_LPM },
 
         /* Blackmagic Design UltraStudio SDI */
         { USB_DEVICE(0x1edb, 0xbd4f), .driver_info = USB_QUIRK_NO_LPM },
 
+        /* INTEL VALUE SSD */
+        { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
+
         { }  /* terminating entry must be last */
 };
 
diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 3c58d633ce80..dec0b21fc626 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -64,6 +64,17 @@
         DWC2_TRACE_SCHEDULER_VB(pr_fmt("%s: SCH: " fmt),                \
                                 dev_name(hsotg->dev), ##__VA_ARGS__)
 
+#ifdef CONFIG_MIPS
+/*
+ * There are some MIPS machines that can run in either big-endian
+ * or little-endian mode and that use the dwc2 register without
+ * a byteswap in both ways.
+ * Unlike other architectures, MIPS apparently does not require a
+ * barrier before the __raw_writel() to synchronize with DMA but does
+ * require the barrier after the __raw_writel() to serialize a set of
+ * writes. This set of operations was added specifically for MIPS and
+ * should only be used there.
+ */
 static inline u32 dwc2_readl(const void __iomem *addr)
 {
         u32 value = __raw_readl(addr);
@@ -90,6 +101,22 @@ static inline void dwc2_writel(u32 value, void __iomem *addr)
         pr_info("INFO:: wrote %08x to %p\n", value, addr);
 #endif
 }
+#else
+/* Normal architectures just use readl/write */
+static inline u32 dwc2_readl(const void __iomem *addr)
+{
+        return readl(addr);
+}
+
+static inline void dwc2_writel(u32 value, void __iomem *addr)
+{
+        writel(value, addr);
+
+#ifdef DWC2_LOG_WRITES
+        pr_info("info:: wrote %08x to %p\n", value, addr);
+#endif
+}
+#endif
 
 /* Maximum number of Endpoints/HostChannels */
 #define MAX_EPS_CHANNELS        16
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 4c5e3005e1dc..26cf09d0fe3c 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -1018,7 +1018,7 @@ static int dwc2_hsotg_process_req_status(struct dwc2_hsotg *hsotg,
         return 1;
 }
 
-static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value);
+static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value, bool now);
 
 /**
  * get_ep_head - return the first request on the endpoint
@@ -1094,7 +1094,7 @@ static int dwc2_hsotg_process_req_feature(struct dwc2_hsotg *hsotg,
                 case USB_ENDPOINT_HALT:
                         halted = ep->halted;
 
-                        dwc2_hsotg_ep_sethalt(&ep->ep, set);
+                        dwc2_hsotg_ep_sethalt(&ep->ep, set, true);
 
                         ret = dwc2_hsotg_send_reply(hsotg, ep0, NULL, 0);
                         if (ret) {
@@ -2948,8 +2948,13 @@ static int dwc2_hsotg_ep_dequeue(struct usb_ep *ep, struct usb_request *req)
  * dwc2_hsotg_ep_sethalt - set halt on a given endpoint
  * @ep: The endpoint to set halt.
  * @value: Set or unset the halt.
+ * @now: If true, stall the endpoint now. Otherwise return -EAGAIN if
+ *       the endpoint is busy processing requests.
+ *
+ * We need to stall the endpoint immediately if request comes from set_feature
+ * protocol command handler.
  */
-static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value)
+static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value, bool now)
 {
         struct dwc2_hsotg_ep *hs_ep = our_ep(ep);
         struct dwc2_hsotg *hs = hs_ep->parent;
@@ -2969,6 +2974,17 @@ static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value)
                 return 0;
         }
 
+        if (hs_ep->isochronous) {
+                dev_err(hs->dev, "%s is Isochronous Endpoint\n", ep->name);
+                return -EINVAL;
+        }
+
+        if (!now && value && !list_empty(&hs_ep->queue)) {
+                dev_dbg(hs->dev, "%s request is pending, cannot halt\n",
+                        ep->name);
+                return -EAGAIN;
+        }
+
         if (hs_ep->dir_in) {
                 epreg = DIEPCTL(index);
                 epctl = dwc2_readl(hs->regs + epreg);
@@ -3020,7 +3036,7 @@ static int dwc2_hsotg_ep_sethalt_lock(struct usb_ep *ep, int value)
         int ret = 0;
 
         spin_lock_irqsave(&hs->lock, flags);
-        ret = dwc2_hsotg_ep_sethalt(ep, value);
+        ret = dwc2_hsotg_ep_sethalt(ep, value, false);
         spin_unlock_irqrestore(&hs->lock, flags);
 
         return ret;
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 7ddf9449a063..654050684f4f 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -402,6 +402,7 @@
 #define DWC3_DEPCMD_GET_RSC_IDX(x)      (((x) >> DWC3_DEPCMD_PARAM_SHIFT) & 0x7f)
 #define DWC3_DEPCMD_STATUS(x)           (((x) >> 12) & 0x0F)
 #define DWC3_DEPCMD_HIPRI_FORCERM       (1 << 11)
+#define DWC3_DEPCMD_CLEARPENDIN         (1 << 11)
 #define DWC3_DEPCMD_CMDACT              (1 << 10)
 #define DWC3_DEPCMD_CMDIOC              (1 << 8)
 
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index dd5cb5577dca..2f1fb7e7aa54 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -128,12 +128,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, exynos);
 
-        ret = dwc3_exynos_register_phys(exynos);
-        if (ret) {
-                dev_err(dev, "couldn't register PHYs\n");
-                return ret;
-        }
-
         exynos->dev     = dev;
 
         exynos->clk = devm_clk_get(dev, "usbdrd30");
@@ -183,20 +177,29 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
                 goto err3;
         }
 
+        ret = dwc3_exynos_register_phys(exynos);
+        if (ret) {
+                dev_err(dev, "couldn't register PHYs\n");
+                goto err4;
+        }
+
         if (node) {
                 ret = of_platform_populate(node, NULL, NULL, dev);
                 if (ret) {
                         dev_err(dev, "failed to add dwc3 core\n");
-                        goto err4;
+                        goto err5;
                 }
         } else {
                 dev_err(dev, "no device node, failed to add dwc3 core\n");
                 ret = -ENODEV;
-                goto err4;
+                goto err5;
         }
 
         return 0;
 
+err5:
+        platform_device_unregister(exynos->usb2_phy);
+        platform_device_unregister(exynos->usb3_phy);
 err4:
         regulator_disable(exynos->vdd10);
 err3:
diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c
index 5c0adb9c6fb2..50d6ae6f88bc 100644
--- a/drivers/usb/dwc3/dwc3-st.c
+++ b/drivers/usb/dwc3/dwc3-st.c
@@ -129,12 +129,18 @@ static int st_dwc3_drd_init(struct st_dwc3 *dwc3_data)
         switch (dwc3_data->dr_mode) {
         case USB_DR_MODE_PERIPHERAL:
 
-                val &= ~(USB3_FORCE_VBUSVALID | USB3_DELAY_VBUSVALID
+                val &= ~(USB3_DELAY_VBUSVALID
                         | USB3_SEL_FORCE_OPMODE | USB3_FORCE_OPMODE(0x3)
                         | USB3_SEL_FORCE_DPPULLDOWN2 | USB3_FORCE_DPPULLDOWN2
                         | USB3_SEL_FORCE_DMPULLDOWN2 | USB3_FORCE_DMPULLDOWN2);
 
-                val |= USB3_DEVICE_NOT_HOST;
+                /*
+                 * USB3_PORT2_FORCE_VBUSVALID When '1' and when
+                 * USB3_PORT2_DEVICE_NOT_HOST = 1, forces VBUSVLDEXT2 input
+                 * of the pico PHY to 1.
+                 */
+
+                val |= USB3_DEVICE_NOT_HOST | USB3_FORCE_VBUSVALID;
                 break;
 
         case USB_DR_MODE_HOST:
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 9a7d0bd15dc3..07248ff1be5c 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -347,6 +347,28 @@ int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep,
         return ret;
 }
 
+static int dwc3_send_clear_stall_ep_cmd(struct dwc3_ep *dep)
+{
+        struct dwc3 *dwc = dep->dwc;
+        struct dwc3_gadget_ep_cmd_params params;
+        u32 cmd = DWC3_DEPCMD_CLEARSTALL;
+
+        /*
+         * As of core revision 2.60a the recommended programming model
+         * is to set the ClearPendIN bit when issuing a Clear Stall EP
+         * command for IN endpoints. This is to prevent an issue where
+         * some (non-compliant) hosts may not send ACK TPs for pending
+         * IN transfers due to a mishandled error condition. Synopsys
+         * STAR 9000614252.
+         */
+        if (dep->direction && (dwc->revision >= DWC3_REVISION_260A))
+                cmd |= DWC3_DEPCMD_CLEARPENDIN;
+
+        memset(&params, 0, sizeof(params));
+
+        return dwc3_send_gadget_ep_cmd(dwc, dep->number, cmd, &params);
+}
+
 static dma_addr_t dwc3_trb_dma_offset(struct dwc3_ep *dep,
                 struct dwc3_trb *trb)
 {
@@ -1314,8 +1336,7 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol)
                 else
                         dep->flags |= DWC3_EP_STALL;
         } else {
-                ret = dwc3_send_gadget_ep_cmd(dwc, dep->number,
-                        DWC3_DEPCMD_CLEARSTALL, &params);
+                ret = dwc3_send_clear_stall_ep_cmd(dep);
                 if (ret)
                         dev_err(dwc->dev, "failed to clear STALL on %s\n",
                                         dep->name);
@@ -2247,7 +2268,6 @@ static void dwc3_clear_stall_all_ep(struct dwc3 *dwc)
 
         for (epnum = 1; epnum < DWC3_ENDPOINTS_NUM; epnum++) {
                 struct dwc3_ep *dep;
-                struct dwc3_gadget_ep_cmd_params params;
                 int ret;
 
                 dep = dwc->eps[epnum];
@@ -2259,9 +2279,7 @@ static void dwc3_clear_stall_all_ep(struct dwc3 *dwc)
 
                 dep->flags &= ~DWC3_EP_STALL;
 
-                memset(&params, 0, sizeof(params));
-                ret = dwc3_send_gadget_ep_cmd(dwc, dep->number,
-                                DWC3_DEPCMD_CLEARSTALL, &params);
+                ret = dwc3_send_clear_stall_ep_cmd(dep);
                 WARN_ON_ONCE(ret);
         }
 }
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index d67de0d22a2b..eb648485a58c 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1868,14 +1868,19 @@ unknown:
                                 }
                                 break;
                         }
-                        req->length = value;
-                        req->context = cdev;
-                        req->zero = value < w_length;
-                        value = composite_ep0_queue(cdev, req, GFP_ATOMIC);
-                        if (value < 0) {
-                                DBG(cdev, "ep_queue --> %d\n", value);
-                                req->status = 0;
-                                composite_setup_complete(gadget->ep0, req);
+
+                        if (value >= 0) {
+                                req->length = value;
+                                req->context = cdev;
+                                req->zero = value < w_length;
+                                value = composite_ep0_queue(cdev, req,
+                                                            GFP_ATOMIC);
+                                if (value < 0) {
+                                        DBG(cdev, "ep_queue --> %d\n", value);
+                                        req->status = 0;
+                                        composite_setup_complete(gadget->ep0,
+                                                                 req);
+                                }
                         }
                         return value;
                 }
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index b6f60ca8a035..70cf3477f951 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -1401,6 +1401,7 @@ static const struct usb_gadget_driver configfs_driver_template = {
                 .owner          = THIS_MODULE,
                 .name           = "configfs-gadget",
         },
+        .match_existing_only = 1,
 };
 
 static struct config_group *gadgets_make(
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 73515d54e1cc..cc33d2667408 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -2051,7 +2051,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])
@@ -2729,6 +2729,7 @@ static int _ffs_func_bind(struct usb_configuration *c,
                 func->ffs->ss_descs_count;
 
         int fs_len, hs_len, ss_len, ret, i;
+        struct ffs_ep *eps_ptr;
 
         /* Make it a single chunk, less management later on */
         vla_group(d);
@@ -2777,12 +2778,9 @@ static int _ffs_func_bind(struct usb_configuration *c,
                ffs->raw_descs_length);
 
         memset(vla_ptr(vlabuf, d, inums), 0xff, d_inums__sz);
-        for (ret = ffs->eps_count; ret; --ret) {
-                struct ffs_ep *ptr;
-
-                ptr = vla_ptr(vlabuf, d, eps);
-                ptr[ret].num = -1;
-        }
+        eps_ptr = vla_ptr(vlabuf, d, eps);
+        for (i = 0; i < ffs->eps_count; i++)
+                eps_ptr[i].num = -1;
 
         /* Save pointers
          * d_eps == vlabuf, func->eps used to kfree vlabuf later
@@ -2851,7 +2849,7 @@ static int _ffs_func_bind(struct usb_configuration *c,
                 goto error;
 
         func->function.os_desc_table = vla_ptr(vlabuf, d, os_desc_table);
-        if (c->cdev->use_os_string)
+        if (c->cdev->use_os_string) {
                 for (i = 0; i < ffs->interfaces_count; ++i) {
                         struct usb_os_desc *desc;
 
@@ -2862,13 +2860,15 @@ static int _ffs_func_bind(struct usb_configuration *c,
                                 vla_ptr(vlabuf, d, ext_compat) + i * 16;
                         INIT_LIST_HEAD(&desc->ext_prop);
                 }
-        ret = ffs_do_os_descs(ffs->ms_os_descs_count,
-                              vla_ptr(vlabuf, d, raw_descs) +
-                              fs_len + hs_len + ss_len,
-                              d_raw_descs__sz - fs_len - hs_len - ss_len,
-                              __ffs_func_bind_do_os_desc, func);
-        if (unlikely(ret < 0))
-                goto error;
+                ret = ffs_do_os_descs(ffs->ms_os_descs_count,
+                                      vla_ptr(vlabuf, d, raw_descs) +
+                                      fs_len + hs_len + ss_len,
+                                      d_raw_descs__sz - fs_len - hs_len -
+                                      ss_len,
+                                      __ffs_func_bind_do_os_desc, func);
+                if (unlikely(ret < 0))
+                        goto error;
+        }
         func->function.os_desc_n =
                 c->cdev->use_os_string ? ffs->interfaces_count : 0;
 
diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c
index c45104e3a64b..64706a789580 100644
--- a/drivers/usb/gadget/function/f_printer.c
+++ b/drivers/usb/gadget/function/f_printer.c
@@ -161,14 +161,6 @@ static struct usb_endpoint_descriptor hs_ep_out_desc = {
         .wMaxPacketSize =       cpu_to_le16(512)
 };
 
-static struct usb_qualifier_descriptor dev_qualifier = {
-        .bLength =              sizeof(dev_qualifier),
-        .bDescriptorType =      USB_DT_DEVICE_QUALIFIER,
-        .bcdUSB =               cpu_to_le16(0x0200),
-        .bDeviceClass =         USB_CLASS_PRINTER,
-        .bNumConfigurations =   1
-};
-
 static struct usb_descriptor_header *hs_printer_function[] = {
         (struct usb_descriptor_header *) &intf_desc,
         (struct usb_descriptor_header *) &hs_ep_in_desc,
diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
index 35fe3c80cfc0..197f73386fac 100644
--- a/drivers/usb/gadget/function/f_tcm.c
+++ b/drivers/usb/gadget/function/f_tcm.c
@@ -1445,16 +1445,18 @@ static void usbg_drop_tpg(struct se_portal_group *se_tpg)
         for (i = 0; i < TPG_INSTANCES; ++i)
                 if (tpg_instances[i].tpg == tpg)
                         break;
-        if (i < TPG_INSTANCES)
+        if (i < TPG_INSTANCES) {
                 tpg_instances[i].tpg = NULL;
-        opts = container_of(tpg_instances[i].func_inst,
-                struct f_tcm_opts, func_inst);
-        mutex_lock(&opts->dep_lock);
-        if (opts->has_dep)
-                module_put(opts->dependent);
-        else
-                configfs_undepend_item_unlocked(&opts->func_inst.group.cg_item);
-        mutex_unlock(&opts->dep_lock);
+                opts = container_of(tpg_instances[i].func_inst,
+                        struct f_tcm_opts, func_inst);
+                mutex_lock(&opts->dep_lock);
+                if (opts->has_dep)
+                        module_put(opts->dependent);
+                else
+                        configfs_undepend_item_unlocked(
+                                &opts->func_inst.group.cg_item);
+                mutex_unlock(&opts->dep_lock);
+        }
         mutex_unlock(&tpg_instances_lock);
 
         kfree(tpg);
diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
index 186d4b162524..cd214ec8a601 100644
--- a/drivers/usb/gadget/function/f_uac2.c
+++ b/drivers/usb/gadget/function/f_uac2.c
@@ -598,18 +598,6 @@ static struct usb_gadget_strings *fn_strings[] = {
         NULL,
 };
 
-static struct usb_qualifier_descriptor devqual_desc = {
-        .bLength = sizeof devqual_desc,
-        .bDescriptorType = USB_DT_DEVICE_QUALIFIER,
-
-        .bcdUSB = cpu_to_le16(0x200),
-        .bDeviceClass = USB_CLASS_MISC,
-        .bDeviceSubClass = 0x02,
-        .bDeviceProtocol = 0x01,
-        .bNumConfigurations = 1,
-        .bRESERVED = 0,
-};
-
 static struct usb_interface_assoc_descriptor iad_desc = {
         .bLength = sizeof iad_desc,
         .bDescriptorType = USB_DT_INTERFACE_ASSOCIATION,
@@ -1292,6 +1280,7 @@ in_rq_cur(struct usb_function *fn, const struct usb_ctrlrequest *cr)
 
         if (control_selector == UAC2_CS_CONTROL_SAM_FREQ) {
                 struct cntrl_cur_lay3 c;
+                memset(&c, 0, sizeof(struct cntrl_cur_lay3));
 
                 if (entity_id == USB_IN_CLK_ID)
                         c.dCUR = p_srate;
diff --git a/drivers/usb/gadget/function/storage_common.c b/drivers/usb/gadget/function/storage_common.c
index d62683017cf3..990df221c629 100644
--- a/drivers/usb/gadget/function/storage_common.c
+++ b/drivers/usb/gadget/function/storage_common.c
@@ -83,9 +83,7 @@ EXPORT_SYMBOL_GPL(fsg_fs_function);
  * USB 2.0 devices need to expose both high speed and full speed
  * descriptors, unless they only run at full speed.
  *
- * That means alternate endpoint descriptors (bigger packets)
- * and a "device qualifier" ... plus more construction options
- * for the configuration descriptor.
+ * That means alternate endpoint descriptors (bigger packets).
  */
 struct usb_endpoint_descriptor fsg_hs_bulk_in_desc = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index e64479f882a5..aa3707bdebb4 100644
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -938,8 +938,11 @@ ep0_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr)
                         struct usb_ep           *ep = dev->gadget->ep0;
                         struct usb_request      *req = dev->req;
 
-                        if ((retval = setup_req (ep, req, 0)) == 0)
-                                retval = usb_ep_queue (ep, req, GFP_ATOMIC);
+                        if ((retval = setup_req (ep, req, 0)) == 0) {
+                                spin_unlock_irq (&dev->lock);
+                                retval = usb_ep_queue (ep, req, GFP_KERNEL);
+                                spin_lock_irq (&dev->lock);
+                        }
                         dev->state = STATE_DEV_CONNECTED;
 
                         /* assume that was SET_CONFIGURATION */
@@ -1457,8 +1460,11 @@ delegate:
                                                         w_length);
                                 if (value < 0)
                                         break;
+
+                                spin_unlock (&dev->lock);
                                 value = usb_ep_queue (gadget->ep0, dev->req,
-                                                        GFP_ATOMIC);
+                                                        GFP_KERNEL);
+                                spin_lock (&dev->lock);
                                 if (value < 0) {
                                         clean_req (gadget->ep0, dev->req);
                                         break;
@@ -1481,11 +1487,14 @@ delegate:
         if (value >= 0 && dev->state != STATE_DEV_SETUP) {
                 req->length = value;
                 req->zero = value < w_length;
-                value = usb_ep_queue (gadget->ep0, req, GFP_ATOMIC);
+
+                spin_unlock (&dev->lock);
+                value = usb_ep_queue (gadget->ep0, req, GFP_KERNEL);
                 if (value < 0) {
                         DBG (dev, "ep_queue --> %d\n", value);
                         req->status = 0;
                 }
+                return value;
         }
 
         /* device stalls when value < 0 */
diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 6e8300d6a737..e1b2dcebdc2e 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -603,11 +603,15 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver)
                 }
         }
 
-        list_add_tail(&driver->pending, &gadget_driver_pending_list);
-        pr_info("udc-core: couldn't find an available UDC - added [%s] to list of pending drivers\n",
-                driver->function);
+        if (!driver->match_existing_only) {
+                list_add_tail(&driver->pending, &gadget_driver_pending_list);
+                pr_info("udc-core: couldn't find an available UDC - added [%s] to list of pending drivers\n",
+                        driver->function);
+                ret = 0;
+        }
+
         mutex_unlock(&udc_lock);
-        return 0;
+        return ret;
 found:
         ret = udc_bind_to_driver(udc, driver);
         mutex_unlock(&udc_lock);
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index ae1b6e69eb96..a962b89b65a6 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -368,6 +368,15 @@ static void ehci_shutdown(struct usb_hcd *hcd)
 {
         struct ehci_hcd *ehci = hcd_to_ehci(hcd);
 
+        /**
+         * Protect the system from crashing at system shutdown in cases where
+         * usb host is not added yet from OTG controller driver.
+         * As ehci_setup() not done yet, so stop accessing registers or
+         * variables initialized in ehci_setup()
+         */
+        if (!ehci->sbrn)
+                return;
+
         spin_lock_irq(&ehci->lock);
         ehci->shutdown = true;
         ehci->rh_state = EHCI_RH_STOPPING;
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index ffc90295a95f..74f62d68f013 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -872,15 +872,23 @@ int ehci_hub_control(
 ) {
         struct ehci_hcd *ehci = hcd_to_ehci (hcd);
         int             ports = HCS_N_PORTS (ehci->hcs_params);
-        u32 __iomem     *status_reg = &ehci->regs->port_status[
-                                (wIndex & 0xff) - 1];
-        u32 __iomem     *hostpc_reg = &ehci->regs->hostpc[(wIndex & 0xff) - 1];
+        u32 __iomem     *status_reg, *hostpc_reg;
         u32             temp, temp1, status;
         unsigned long   flags;
         int             retval = 0;
         unsigned        selector;
 
         /*
+         * Avoid underflow while calculating (wIndex & 0xff) - 1.
+         * The compiler might deduce that wIndex can never be 0 and then
+         * optimize away the tests for !wIndex below.
+         */
+        temp = wIndex & 0xff;
+        temp -= (temp > 0);
+        status_reg = &ehci->regs->port_status[temp];
+        hostpc_reg = &ehci->regs->hostpc[temp];
+
+        /*
          * FIXME:  support SetPortFeatures USB_PORT_FEAT_INDICATOR.
          * HCS_INDICATOR may say we can change LEDs to off/amber/green.
          * (track current state ourselves) ... blink for diagnostics,
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index d3afc89d00f5..2f8d3af811ce 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -179,22 +179,32 @@ static int ehci_msm_remove(struct platform_device *pdev)
 static int ehci_msm_pm_suspend(struct device *dev)
 {
         struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
         bool do_wakeup = device_may_wakeup(dev);
 
         dev_dbg(dev, "ehci-msm PM suspend\n");
 
-        return ehci_suspend(hcd, do_wakeup);
+        /* Only call ehci_suspend if ehci_setup has been done */
+        if (ehci->sbrn)
+                return ehci_suspend(hcd, do_wakeup);
+
+        return 0;
 }
 
 static int ehci_msm_pm_resume(struct device *dev)
 {
         struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
 
         dev_dbg(dev, "ehci-msm PM resume\n");
-        ehci_resume(hcd, false);
+
+        /* Only call ehci_resume if ehci_setup has been done */
+        if (ehci->sbrn)
+                ehci_resume(hcd, false);
 
         return 0;
 }
+
 #else
 #define ehci_msm_pm_suspend     NULL
 #define ehci_msm_pm_resume      NULL
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 4031b372008e..9a3d7db5be57 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -81,15 +81,23 @@ static int tegra_reset_usb_controller(struct platform_device *pdev)
         struct usb_hcd *hcd = platform_get_drvdata(pdev);
         struct tegra_ehci_hcd *tegra =
                 (struct tegra_ehci_hcd *)hcd_to_ehci(hcd)->priv;
+        bool has_utmi_pad_registers = false;
 
         phy_np = of_parse_phandle(pdev->dev.of_node, "nvidia,phy", 0);
         if (!phy_np)
                 return -ENOENT;
 
+        if (of_property_read_bool(phy_np, "nvidia,has-utmi-pad-registers"))
+                has_utmi_pad_registers = true;
+
         if (!usb1_reset_attempted) {
                 struct reset_control *usb1_reset;
 
-                usb1_reset = of_reset_control_get(phy_np, "usb");
+                if (!has_utmi_pad_registers)
+                        usb1_reset = of_reset_control_get(phy_np, "utmi-pads");
+                else
+                        usb1_reset = tegra->rst;
+
                 if (IS_ERR(usb1_reset)) {
                         dev_warn(&pdev->dev,
                                  "can't get utmi-pads reset from the PHY\n");
@@ -99,13 +107,15 @@ static int tegra_reset_usb_controller(struct platform_device *pdev)
                         reset_control_assert(usb1_reset);
                         udelay(1);
                         reset_control_deassert(usb1_reset);
+
+                        if (!has_utmi_pad_registers)
+                                reset_control_put(usb1_reset);
                 }
 
-                reset_control_put(usb1_reset);
                 usb1_reset_attempted = true;
         }
 
-        if (!of_property_read_bool(phy_np, "nvidia,has-utmi-pad-registers")) {
+        if (!has_utmi_pad_registers) {
                 reset_control_assert(tegra->rst);
                 udelay(1);
                 reset_control_deassert(tegra->rst);
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index d029bbe9eb36..641fed609911 100644
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -183,7 +183,6 @@ static int ed_schedule (struct ohci_hcd *ohci, struct ed *ed)
 {
         int     branch;
 
-        ed->state = ED_OPER;
         ed->ed_prev = NULL;
         ed->ed_next = NULL;
         ed->hwNextED = 0;
@@ -259,6 +258,8 @@ static int ed_schedule (struct ohci_hcd *ohci, struct ed *ed)
         /* the HC may not see the schedule updates yet, but if it does
          * then they'll be properly ordered.
          */
+
+        ed->state = ED_OPER;
         return 0;
 }
 
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 48672fac7ff3..c10972fcc8e4 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -37,6 +37,7 @@
 /* Device for a quirk */
 #define PCI_VENDOR_ID_FRESCO_LOGIC      0x1b73
 #define PCI_DEVICE_ID_FRESCO_LOGIC_PDK  0x1000
+#define PCI_DEVICE_ID_FRESCO_LOGIC_FL1009       0x1009
 #define PCI_DEVICE_ID_FRESCO_LOGIC_FL1400       0x1400
 
 #define PCI_VENDOR_ID_ETRON             0x1b6f
@@ -114,6 +115,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
                 xhci->quirks |= XHCI_TRUST_TX_LENGTH;
         }
 
+        if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC &&
+                        pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1009)
+                xhci->quirks |= XHCI_BROKEN_STREAMS;
+
         if (pdev->vendor == PCI_VENDOR_ID_NEC)
                 xhci->quirks |= XHCI_NEC_HOST;
 
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 676ea458148b..1f3f981fe7f8 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -196,6 +196,9 @@ static int xhci_plat_probe(struct platform_device *pdev)
                 ret = clk_prepare_enable(clk);
                 if (ret)
                         goto put_hcd;
+        } else if (PTR_ERR(clk) == -EPROBE_DEFER) {
+                ret = -EPROBE_DEFER;
+                goto put_hcd;
         }
 
         xhci = hcd_to_xhci(hcd);
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 52deae4b7eac..d7d502578d79 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -290,6 +290,14 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci)
 
         temp_64 = xhci_read_64(xhci, &xhci->op_regs->cmd_ring);
         xhci->cmd_ring_state = CMD_RING_STATE_ABORTED;
+
+        /*
+         * 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));
         xhci_write_64(xhci, temp_64 | CMD_RING_ABORT,
                         &xhci->op_regs->cmd_ring);
 
@@ -314,6 +322,7 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci)
 
                 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_quiesce(xhci);
                 xhci_halt(xhci);
@@ -1246,22 +1255,21 @@ void xhci_handle_command_timeout(unsigned long data)
         int ret;
         unsigned long flags;
         u64 hw_ring_state;
-        struct xhci_command *cur_cmd = NULL;
+        bool second_timeout = false;
         xhci = (struct xhci_hcd *) data;
 
         /* mark this command to be cancelled */
         spin_lock_irqsave(&xhci->lock, flags);
         if (xhci->current_cmd) {
-                cur_cmd = xhci->current_cmd;
-                cur_cmd->status = COMP_CMD_ABORT;
+                if (xhci->current_cmd->status == COMP_CMD_ABORT)
+                        second_timeout = true;
+                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);
                 xhci_dbg(xhci, "Command timeout\n");
                 ret = xhci_abort_cmd_ring(xhci);
@@ -1273,6 +1281,15 @@ void xhci_handle_command_timeout(unsigned long data)
                 }
                 return;
         }
+
+        /* 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");
+                xhci_cleanup_command_queue(xhci);
+                return;
+        }
+
         /* 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);
@@ -2721,7 +2738,8 @@ hw_died:
                 writel(irq_pending, &xhci->ir_set->irq_pending);
         }
 
-        if (xhci->xhc_state & XHCI_STATE_DYING) {
+        if (xhci->xhc_state & XHCI_STATE_DYING ||
+            xhci->xhc_state & XHCI_STATE_HALTED) {
                 xhci_dbg(xhci, "xHCI dying, ignoring interrupt. "
                                 "Shouldn't IRQs be disabled?\n");
                 /* Clear the event handler busy flag (RW1C);
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index fa7e1ef36cd9..f2f9518c53ab 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -685,20 +685,23 @@ void xhci_stop(struct usb_hcd *hcd)
         u32 temp;
         struct xhci_hcd *xhci = hcd_to_xhci(hcd);
 
-        if (xhci->xhc_state & XHCI_STATE_HALTED)
-                return;
-
         mutex_lock(&xhci->mutex);
-        spin_lock_irq(&xhci->lock);
-        xhci->xhc_state |= XHCI_STATE_HALTED;
-        xhci->cmd_ring_state = CMD_RING_STATE_STOPPED;
 
-        /* Make sure the xHC is halted for a USB3 roothub
-         * (xhci_stop() could be called as part of failed init).
-         */
-        xhci_halt(xhci);
-        xhci_reset(xhci);
-        spin_unlock_irq(&xhci->lock);
+        if (!(xhci->xhc_state & XHCI_STATE_HALTED)) {
+                spin_lock_irq(&xhci->lock);
+
+                xhci->xhc_state |= XHCI_STATE_HALTED;
+                xhci->cmd_ring_state = CMD_RING_STATE_STOPPED;
+                xhci_halt(xhci);
+                xhci_reset(xhci);
+
+                spin_unlock_irq(&xhci->lock);
+        }
+
+        if (!usb_hcd_is_primary_hcd(hcd)) {
+                mutex_unlock(&xhci->mutex);
+                return;
+        }
 
         xhci_cleanup_msix(xhci);
 
@@ -4886,7 +4889,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
                 xhci->hcc_params2 = readl(&xhci->cap_regs->hcc_params2);
         xhci_print_registers(xhci);
 
-        xhci->quirks = quirks;
+        xhci->quirks |= quirks;
 
         get_quirks(dev, xhci);
 
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 39fd95833eb8..f824336def5c 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1090,29 +1090,6 @@ void musb_stop(struct musb *musb)
         musb_platform_try_idle(musb, 0);
 }
 
-static void musb_shutdown(struct platform_device *pdev)
-{
-        struct musb     *musb = dev_to_musb(&pdev->dev);
-        unsigned long   flags;
-
-        pm_runtime_get_sync(musb->controller);
-
-        musb_host_cleanup(musb);
-        musb_gadget_cleanup(musb);
-
-        spin_lock_irqsave(&musb->lock, flags);
-        musb_platform_disable(musb);
-        musb_generic_disable(musb);
-        spin_unlock_irqrestore(&musb->lock, flags);
-
-        musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
-        musb_platform_exit(musb);
-
-        pm_runtime_put(musb->controller);
-        /* FIXME power down */
-}
-
-
 /*-------------------------------------------------------------------------*/
 
 /*
@@ -1702,7 +1679,7 @@ EXPORT_SYMBOL_GPL(musb_dma_completion);
 #define use_dma                 0
 #endif
 
-static void (*musb_phy_callback)(enum musb_vbus_id_status status);
+static int (*musb_phy_callback)(enum musb_vbus_id_status status);
 
 /*
  * musb_mailbox - optional phy notifier function
@@ -1711,11 +1688,12 @@ static void (*musb_phy_callback)(enum musb_vbus_id_status status);
  * Optionally gets called from the USB PHY. Note that the USB PHY must be
  * disabled at the point the phy_callback is registered or unregistered.
  */
-void musb_mailbox(enum musb_vbus_id_status status)
+int musb_mailbox(enum musb_vbus_id_status status)
 {
         if (musb_phy_callback)
-                musb_phy_callback(status);
+                return musb_phy_callback(status);
 
+        return -ENODEV;
 };
 EXPORT_SYMBOL_GPL(musb_mailbox);
 
@@ -2028,11 +2006,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
         musb_readl = musb_default_readl;
         musb_writel = musb_default_writel;
 
-        /* We need musb_read/write functions initialized for PM */
-        pm_runtime_use_autosuspend(musb->controller);
-        pm_runtime_set_autosuspend_delay(musb->controller, 200);
-        pm_runtime_enable(musb->controller);
-
         /* The musb_platform_init() call:
          *   - adjusts musb->mregs
          *   - sets the musb->isr
@@ -2134,6 +2107,16 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
         if (musb->ops->phy_callback)
                 musb_phy_callback = musb->ops->phy_callback;
 
+        /*
+         * We need musb_read/write functions initialized for PM.
+         * Note that at least 2430 glue needs autosuspend delay
+         * somewhere above 300 ms for the hardware to idle properly
+         * after disconnecting the cable in host mode. Let's use
+         * 500 ms for some margin.
+         */
+        pm_runtime_use_autosuspend(musb->controller);
+        pm_runtime_set_autosuspend_delay(musb->controller, 500);
+        pm_runtime_enable(musb->controller);
         pm_runtime_get_sync(musb->controller);
 
         status = usb_phy_init(musb->xceiv);
@@ -2237,13 +2220,8 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
         if (status)
                 goto fail5;
 
-        pm_runtime_put(musb->controller);
-
-        /*
-         * For why this is currently needed, see commit 3e43a0725637
-         * ("usb: musb: core: add pm_runtime_irq_safe()")
-         */
-        pm_runtime_irq_safe(musb->controller);
+        pm_runtime_mark_last_busy(musb->controller);
+        pm_runtime_put_autosuspend(musb->controller);
 
         return 0;
 
@@ -2265,7 +2243,9 @@ fail2_5:
         usb_phy_shutdown(musb->xceiv);
 
 err_usb_phy_init:
+        pm_runtime_dont_use_autosuspend(musb->controller);
         pm_runtime_put_sync(musb->controller);
+        pm_runtime_disable(musb->controller);
 
 fail2:
         if (musb->irq_wake)
@@ -2273,7 +2253,6 @@ fail2:
         musb_platform_exit(musb);
 
 fail1:
-        pm_runtime_disable(musb->controller);
         dev_err(musb->controller,
                 "musb_init_controller failed with status %d\n", status);
 
@@ -2312,6 +2291,7 @@ static int musb_remove(struct platform_device *pdev)
 {
         struct device   *dev = &pdev->dev;
         struct musb     *musb = dev_to_musb(dev);
+        unsigned long   flags;
 
         /* this gets called on rmmod.
          *  - Host mode: host may still be active
@@ -2319,17 +2299,26 @@ static int musb_remove(struct platform_device *pdev)
          *  - OTG mode: both roles are deactivated (or never-activated)
          */
         musb_exit_debugfs(musb);
-        musb_shutdown(pdev);
-        musb_phy_callback = NULL;
-
-        if (musb->dma_controller)
-                musb_dma_controller_destroy(musb->dma_controller);
-
-        usb_phy_shutdown(musb->xceiv);
 
         cancel_work_sync(&musb->irq_work);
         cancel_delayed_work_sync(&musb->finish_resume_work);
         cancel_delayed_work_sync(&musb->deassert_reset_work);
+        pm_runtime_get_sync(musb->controller);
+        musb_host_cleanup(musb);
+        musb_gadget_cleanup(musb);
+        spin_lock_irqsave(&musb->lock, flags);
+        musb_platform_disable(musb);
+        musb_generic_disable(musb);
+        spin_unlock_irqrestore(&musb->lock, flags);
+        musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
+        pm_runtime_dont_use_autosuspend(musb->controller);
+        pm_runtime_put_sync(musb->controller);
+        pm_runtime_disable(musb->controller);
+        musb_platform_exit(musb);
+        musb_phy_callback = NULL;
+        if (musb->dma_controller)
+                musb_dma_controller_destroy(musb->dma_controller);
+        usb_phy_shutdown(musb->xceiv);
         musb_free(musb);
         device_init_wakeup(dev, 0);
         return 0;
@@ -2429,7 +2418,8 @@ static void musb_restore_context(struct musb *musb)
         musb_writew(musb_base, MUSB_INTRTXE, musb->intrtxe);
         musb_writew(musb_base, MUSB_INTRRXE, musb->intrrxe);
         musb_writeb(musb_base, MUSB_INTRUSBE, musb->context.intrusbe);
-        musb_writeb(musb_base, MUSB_DEVCTL, musb->context.devctl);
+        if (musb->context.devctl & MUSB_DEVCTL_SESSION)
+                musb_writeb(musb_base, MUSB_DEVCTL, musb->context.devctl);
 
         for (i = 0; i < musb->config->num_eps; ++i) {
                 struct musb_hw_ep       *hw_ep;
@@ -2612,7 +2602,6 @@ static struct platform_driver musb_driver = {
         },
         .probe          = musb_probe,
         .remove         = musb_remove,
-        .shutdown       = musb_shutdown,
 };
 
 module_platform_driver(musb_driver);
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index b6afe9e43305..b55a776b03eb 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -215,7 +215,7 @@ struct musb_platform_ops {
                                 dma_addr_t *dma_addr, u32 *len);
         void    (*pre_root_reset_end)(struct musb *musb);
         void    (*post_root_reset_end)(struct musb *musb);
-        void    (*phy_callback)(enum musb_vbus_id_status status);
+        int     (*phy_callback)(enum musb_vbus_id_status status);
 };
 
 /*
@@ -312,6 +312,7 @@ struct musb {
         struct work_struct      irq_work;
         struct delayed_work     deassert_reset_work;
         struct delayed_work     finish_resume_work;
+        struct delayed_work     gadget_work;
         u16                     hwvers;
 
         u16                     intrrxe;
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 152865b36522..af2a3a7addf9 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1656,6 +1656,20 @@ static int musb_gadget_vbus_draw(struct usb_gadget *gadget, unsigned mA)
         return usb_phy_set_power(musb->xceiv, mA);
 }
 
+static void musb_gadget_work(struct work_struct *work)
+{
+        struct musb *musb;
+        unsigned long flags;
+
+        musb = container_of(work, struct musb, gadget_work.work);
+        pm_runtime_get_sync(musb->controller);
+        spin_lock_irqsave(&musb->lock, flags);
+        musb_pullup(musb, musb->softconnect);
+        spin_unlock_irqrestore(&musb->lock, flags);
+        pm_runtime_mark_last_busy(musb->controller);
+        pm_runtime_put_autosuspend(musb->controller);
+}
+
 static int musb_gadget_pullup(struct usb_gadget *gadget, int is_on)
 {
         struct musb     *musb = gadget_to_musb(gadget);
@@ -1663,20 +1677,16 @@ static int musb_gadget_pullup(struct usb_gadget *gadget, int is_on)
 
         is_on = !!is_on;
 
-        pm_runtime_get_sync(musb->controller);
-
         /* NOTE: this assumes we are sensing vbus; we'd rather
          * not pullup unless the B-session is active.
          */
         spin_lock_irqsave(&musb->lock, flags);
         if (is_on != musb->softconnect) {
                 musb->softconnect = is_on;
-                musb_pullup(musb, is_on);
+                schedule_delayed_work(&musb->gadget_work, 0);
         }
         spin_unlock_irqrestore(&musb->lock, flags);
 
-        pm_runtime_put(musb->controller);
-
         return 0;
 }
 
@@ -1845,7 +1855,7 @@ int musb_gadget_setup(struct musb *musb)
 #elif IS_ENABLED(CONFIG_USB_MUSB_GADGET)
         musb->g.is_otg = 0;
 #endif
-
+        INIT_DELAYED_WORK(&musb->gadget_work, musb_gadget_work);
         musb_g_init_endpoints(musb);
 
         musb->is_active = 0;
@@ -1866,6 +1876,8 @@ void musb_gadget_cleanup(struct musb *musb)
 {
         if (musb->port_mode == MUSB_PORT_MODE_HOST)
                 return;
+
+        cancel_delayed_work_sync(&musb->gadget_work);
         usb_del_gadget_udc(&musb->g);
 }
 
@@ -1914,8 +1926,8 @@ static int musb_gadget_start(struct usb_gadget *g,
         if (musb->xceiv->last_event == USB_EVENT_ID)
                 musb_platform_set_vbus(musb, 1);
 
-        if (musb->xceiv->last_event == USB_EVENT_NONE)
-                pm_runtime_put(musb->controller);
+        pm_runtime_mark_last_busy(musb->controller);
+        pm_runtime_put_autosuspend(musb->controller);
 
         return 0;
 
@@ -1934,8 +1946,7 @@ static int musb_gadget_stop(struct usb_gadget *g)
         struct musb     *musb = gadget_to_musb(g);
         unsigned long   flags;
 
-        if (musb->xceiv->last_event == USB_EVENT_NONE)
-                pm_runtime_get_sync(musb->controller);
+        pm_runtime_get_sync(musb->controller);
 
         /*
          * REVISIT always use otg_set_peripheral() here too;
@@ -1963,7 +1974,8 @@ static int musb_gadget_stop(struct usb_gadget *g)
          * that currently misbehaves.
          */
 
-        pm_runtime_put(musb->controller);
+        pm_runtime_mark_last_busy(musb->controller);
+        pm_runtime_put_autosuspend(musb->controller);
 
         return 0;
 }
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 2f8ad7f1f482..d227a71d85e1 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -434,7 +434,13 @@ static void musb_advance_schedule(struct musb *musb, struct urb *urb,
                 }
         }
 
-        if (qh != NULL && qh->is_ready) {
+        /*
+         * The pipe must be broken if current urb->status is set, so don't
+         * start next urb.
+         * TODO: to minimize the risk of regression, only check urb->status
+         * for RX, until we have a test case to understand the behavior of TX.
+         */
+        if ((!status || !is_in) && qh && qh->is_ready) {
                 dev_dbg(musb->controller, "... next ep%d %cX urb %p\n",
                     hw_ep->epnum, is_in ? 'R' : 'T', next_urb(qh));
                 musb_start_urb(musb, is_in, qh);
@@ -594,14 +600,13 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, u8 epnum)
                 musb_writew(ep->regs, MUSB_TXCSR, 0);
 
         /* scrub all previous state, clearing toggle */
-        } else {
-                csr = musb_readw(ep->regs, MUSB_RXCSR);
-                if (csr & MUSB_RXCSR_RXPKTRDY)
-                        WARNING("rx%d, packet/%d ready?\n", ep->epnum,
-                                musb_readw(ep->regs, MUSB_RXCOUNT));
-
-                musb_h_flush_rxfifo(ep, MUSB_RXCSR_CLRDATATOG);
         }
+        csr = musb_readw(ep->regs, MUSB_RXCSR);
+        if (csr & MUSB_RXCSR_RXPKTRDY)
+                WARNING("rx%d, packet/%d ready?\n", ep->epnum,
+                        musb_readw(ep->regs, MUSB_RXCOUNT));
+
+        musb_h_flush_rxfifo(ep, MUSB_RXCSR_CLRDATATOG);
 
         /* target addr and (for multipoint) hub addr/port */
         if (musb->is_multipoint) {
@@ -627,7 +632,7 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, u8 epnum)
         ep->rx_reinit = 0;
 }
 
-static int musb_tx_dma_set_mode_mentor(struct dma_controller *dma,
+static void musb_tx_dma_set_mode_mentor(struct dma_controller *dma,
                 struct musb_hw_ep *hw_ep, struct musb_qh *qh,
                 struct urb *urb, u32 offset,
                 u32 *length, u8 *mode)
@@ -664,23 +669,18 @@ static int musb_tx_dma_set_mode_mentor(struct dma_controller *dma,
         }
         channel->desired_mode = *mode;
         musb_writew(epio, MUSB_TXCSR, csr);
-
-        return 0;
 }
 
-static int musb_tx_dma_set_mode_cppi_tusb(struct dma_controller *dma,
-                                          struct musb_hw_ep *hw_ep,
-                                          struct musb_qh *qh,
-                                          struct urb *urb,
-                                          u32 offset,
-                                          u32 *length,
-                                          u8 *mode)
+static void musb_tx_dma_set_mode_cppi_tusb(struct dma_controller *dma,
+                                           struct musb_hw_ep *hw_ep,
+                                           struct musb_qh *qh,
+                                           struct urb *urb,
+                                           u32 offset,
+                                           u32 *length,
+                                           u8 *mode)
 {
         struct dma_channel *channel = hw_ep->tx_channel;
 
-        if (!is_cppi_enabled(hw_ep->musb) && !tusb_dma_omap(hw_ep->musb))
-                return -ENODEV;
-
         channel->actual_len = 0;
 
         /*
@@ -688,8 +688,6 @@ static int musb_tx_dma_set_mode_cppi_tusb(struct dma_controller *dma,
          * to identify the zero-length-final-packet case.
          */
         *mode = (urb->transfer_flags & URB_ZERO_PACKET) ? 1 : 0;
-
-        return 0;
 }
 
 static bool musb_tx_dma_program(struct dma_controller *dma,
@@ -699,15 +697,14 @@ static bool musb_tx_dma_program(struct dma_controller *dma,
         struct dma_channel      *channel = hw_ep->tx_channel;
         u16                     pkt_size = qh->maxpacket;
         u8                      mode;
-        int                     res;
 
         if (musb_dma_inventra(hw_ep->musb) || musb_dma_ux500(hw_ep->musb))
-                res = musb_tx_dma_set_mode_mentor(dma, hw_ep, qh, urb,
-                                                 offset, &length, &mode);
+                musb_tx_dma_set_mode_mentor(dma, hw_ep, qh, urb, offset,
+                                            &length, &mode);
+        else if (is_cppi_enabled(hw_ep->musb) || tusb_dma_omap(hw_ep->musb))
+                musb_tx_dma_set_mode_cppi_tusb(dma, hw_ep, qh, urb, offset,
+                                               &length, &mode);
         else
-                res = musb_tx_dma_set_mode_cppi_tusb(dma, hw_ep, qh, urb,
-                                                     offset, &length, &mode);
-        if (res)
                 return false;
 
         qh->segsize = length;
@@ -995,9 +992,15 @@ static void musb_bulk_nak_timeout(struct musb *musb, struct musb_hw_ep *ep,
         if (is_in) {
                 dma = is_dma_capable() ? ep->rx_channel : NULL;
 
-                /* clear nak timeout bit */
+                /*
+                 * Need to stop the transaction by clearing REQPKT first
+                 * then the NAK Timeout bit ref MUSBMHDRC USB 2.0 HIGH-SPEED
+                 * DUAL-ROLE CONTROLLER Programmer's Guide, section 9.2.2
+                 */
                 rx_csr = musb_readw(epio, MUSB_RXCSR);
                 rx_csr |= MUSB_RXCSR_H_WZC_BITS;
+                rx_csr &= ~MUSB_RXCSR_H_REQPKT;
+                musb_writew(epio, MUSB_RXCSR, rx_csr);
                 rx_csr &= ~MUSB_RXCSR_DATAERROR;
                 musb_writew(epio, MUSB_RXCSR, rx_csr);
 
@@ -1551,7 +1554,7 @@ static int musb_rx_dma_iso_cppi41(struct dma_controller *dma,
                                   struct urb *urb,
                                   size_t len)
 {
-        struct dma_channel *channel = hw_ep->tx_channel;
+        struct dma_channel *channel = hw_ep->rx_channel;
         void __iomem *epio = hw_ep->regs;
         dma_addr_t *buf;
         u32 length, res;
@@ -1870,6 +1873,9 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                 status = -EPROTO;
                 musb_writeb(epio, MUSB_RXINTERVAL, 0);
 
+                rx_csr &= ~MUSB_RXCSR_H_ERROR;
+                musb_writew(epio, MUSB_RXCSR, rx_csr);
+
         } else if (rx_csr & MUSB_RXCSR_DATAERROR) {
 
                 if (USB_ENDPOINT_XFER_ISOC != qh->type) {
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index c84e0322c108..0b4cec940386 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -49,97 +49,14 @@ struct omap2430_glue {
         enum musb_vbus_id_status status;
         struct work_struct      omap_musb_mailbox_work;
         struct device           *control_otghs;
+        bool                    cable_connected;
+        bool                    enabled;
+        bool                    powered;
 };
 #define glue_to_musb(g)         platform_get_drvdata(g->musb)
 
 static struct omap2430_glue     *_glue;
 
-static struct timer_list musb_idle_timer;
-
-static void musb_do_idle(unsigned long _musb)
-{
-        struct musb     *musb = (void *)_musb;
-        unsigned long   flags;
-        u8      power;
-        u8      devctl;
-
-        spin_lock_irqsave(&musb->lock, flags);
-
-        switch (musb->xceiv->otg->state) {
-        case OTG_STATE_A_WAIT_BCON:
-
-                devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
-                if (devctl & MUSB_DEVCTL_BDEVICE) {
-                        musb->xceiv->otg->state = OTG_STATE_B_IDLE;
-                        MUSB_DEV_MODE(musb);
-                } else {
-                        musb->xceiv->otg->state = OTG_STATE_A_IDLE;
-                        MUSB_HST_MODE(musb);
-                }
-                break;
-        case OTG_STATE_A_SUSPEND:
-                /* finish RESUME signaling? */
-                if (musb->port1_status & MUSB_PORT_STAT_RESUME) {
-                        power = musb_readb(musb->mregs, MUSB_POWER);
-                        power &= ~MUSB_POWER_RESUME;
-                        dev_dbg(musb->controller, "root port resume stopped, power %02x\n", power);
-                        musb_writeb(musb->mregs, MUSB_POWER, power);
-                        musb->is_active = 1;
-                        musb->port1_status &= ~(USB_PORT_STAT_SUSPEND
-                                                | MUSB_PORT_STAT_RESUME);
-                        musb->port1_status |= USB_PORT_STAT_C_SUSPEND << 16;
-                        usb_hcd_poll_rh_status(musb->hcd);
-                        /* NOTE: it might really be A_WAIT_BCON ... */
-                        musb->xceiv->otg->state = OTG_STATE_A_HOST;
-                }
-                break;
-        case OTG_STATE_A_HOST:
-                devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
-                if (devctl &  MUSB_DEVCTL_BDEVICE)
-                        musb->xceiv->otg->state = OTG_STATE_B_IDLE;
-                else
-                        musb->xceiv->otg->state = OTG_STATE_A_WAIT_BCON;
-        default:
-                break;
-        }
-        spin_unlock_irqrestore(&musb->lock, flags);
-}
-
-
-static void omap2430_musb_try_idle(struct musb *musb, unsigned long timeout)
-{
-        unsigned long           default_timeout = jiffies + msecs_to_jiffies(3);
-        static unsigned long    last_timer;
-
-        if (timeout == 0)
-                timeout = default_timeout;
-
-        /* Never idle if active, or when VBUS timeout is not set as host */
-        if (musb->is_active || ((musb->a_wait_bcon == 0)
-                        && (musb->xceiv->otg->state == OTG_STATE_A_WAIT_BCON))) {
-                dev_dbg(musb->controller, "%s active, deleting timer\n",
-                        usb_otg_state_string(musb->xceiv->otg->state));
-                del_timer(&musb_idle_timer);
-                last_timer = jiffies;
-                return;
-        }
-
-        if (time_after(last_timer, timeout)) {
-                if (!timer_pending(&musb_idle_timer))
-                        last_timer = timeout;
-                else {
-                        dev_dbg(musb->controller, "Longer idle timer already pending, ignoring\n");
-                        return;
-                }
-        }
-        last_timer = timeout;
-
-        dev_dbg(musb->controller, "%s inactive, for idle timer for %lu ms\n",
-                usb_otg_state_string(musb->xceiv->otg->state),
-                (unsigned long)jiffies_to_msecs(timeout - jiffies));
-        mod_timer(&musb_idle_timer, timeout);
-}
-
 static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
 {
         struct usb_otg  *otg = musb->xceiv->otg;
@@ -205,16 +122,6 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
                 musb_readb(musb->mregs, MUSB_DEVCTL));
 }
 
-static int omap2430_musb_set_mode(struct musb *musb, u8 musb_mode)
-{
-        u8      devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
-
-        devctl |= MUSB_DEVCTL_SESSION;
-        musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
-
-        return 0;
-}
-
 static inline void omap2430_low_level_exit(struct musb *musb)
 {
         u32 l;
@@ -234,22 +141,63 @@ static inline void omap2430_low_level_init(struct musb *musb)
         musb_writel(musb->mregs, OTG_FORCESTDBY, l);
 }
 
-static void omap2430_musb_mailbox(enum musb_vbus_id_status status)
+/*
+ * We can get multiple cable events so we need to keep track
+ * of the power state. Only keep power enabled if USB cable is
+ * connected and a gadget is started.
+ */
+static void omap2430_set_power(struct musb *musb, bool enabled, bool cable)
+{
+        struct device *dev = musb->controller;
+        struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
+        bool power_up;
+        int res;
+
+        if (glue->enabled != enabled)
+                glue->enabled = enabled;
+
+        if (glue->cable_connected != cable)
+                glue->cable_connected = cable;
+
+        power_up = glue->enabled && glue->cable_connected;
+        if (power_up == glue->powered) {
+                dev_warn(musb->controller, "power state already %i\n",
+                         power_up);
+                return;
+        }
+
+        glue->powered = power_up;
+
+        if (power_up) {
+                res = pm_runtime_get_sync(musb->controller);
+                if (res < 0) {
+                        dev_err(musb->controller, "could not enable: %i", res);
+                        glue->powered = false;
+                }
+        } else {
+                pm_runtime_mark_last_busy(musb->controller);
+                pm_runtime_put_autosuspend(musb->controller);
+        }
+}
+
+static int omap2430_musb_mailbox(enum musb_vbus_id_status status)
 {
         struct omap2430_glue    *glue = _glue;
 
         if (!glue) {
                 pr_err("%s: musb core is not yet initialized\n", __func__);
-                return;
+                return -EPROBE_DEFER;
         }
         glue->status = status;
 
         if (!glue_to_musb(glue)) {
                 pr_err("%s: musb core is not yet ready\n", __func__);
-                return;
+                return -EPROBE_DEFER;
         }
 
         schedule_work(&glue->omap_musb_mailbox_work);
+
+        return 0;
 }
 
 static void omap_musb_set_mailbox(struct omap2430_glue *glue)
@@ -259,6 +207,13 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
         struct musb_hdrc_platform_data *pdata = dev_get_platdata(dev);
         struct omap_musb_board_data *data = pdata->board_data;
         struct usb_otg *otg = musb->xceiv->otg;
+        bool cable_connected;
+
+        cable_connected = ((glue->status == MUSB_ID_GROUND) ||
+                           (glue->status == MUSB_VBUS_VALID));
+
+        if (cable_connected)
+                omap2430_set_power(musb, glue->enabled, cable_connected);
 
         switch (glue->status) {
         case MUSB_ID_GROUND:
@@ -268,7 +223,6 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
                 musb->xceiv->otg->state = OTG_STATE_A_IDLE;
                 musb->xceiv->last_event = USB_EVENT_ID;
                 if (musb->gadget_driver) {
-                        pm_runtime_get_sync(dev);
                         omap_control_usb_set_mode(glue->control_otghs,
                                 USB_MODE_HOST);
                         omap2430_musb_set_vbus(musb, 1);
@@ -281,8 +235,6 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
                 otg->default_a = false;
                 musb->xceiv->otg->state = OTG_STATE_B_IDLE;
                 musb->xceiv->last_event = USB_EVENT_VBUS;
-                if (musb->gadget_driver)
-                        pm_runtime_get_sync(dev);
                 omap_control_usb_set_mode(glue->control_otghs, USB_MODE_DEVICE);
                 break;
 
@@ -291,11 +243,8 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
                 dev_dbg(dev, "VBUS Disconnect\n");
 
                 musb->xceiv->last_event = USB_EVENT_NONE;
-                if (musb->gadget_driver) {
+                if (musb->gadget_driver)
                         omap2430_musb_set_vbus(musb, 0);
-                        pm_runtime_mark_last_busy(dev);
-                        pm_runtime_put_autosuspend(dev);
-                }
 
                 if (data->interface_type == MUSB_INTERFACE_UTMI)
                         otg_set_vbus(musb->xceiv->otg, 0);
@@ -307,6 +256,9 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
                 dev_dbg(dev, "ID float\n");
         }
 
+        if (!cable_connected)
+                omap2430_set_power(musb, glue->enabled, cable_connected);
+
         atomic_notifier_call_chain(&musb->xceiv->notifier,
                         musb->xceiv->last_event, NULL);
 }
@@ -316,13 +268,8 @@ static void omap_musb_mailbox_work(struct work_struct *mailbox_work)
 {
         struct omap2430_glue *glue = container_of(mailbox_work,
                                 struct omap2430_glue, omap_musb_mailbox_work);
-        struct musb *musb = glue_to_musb(glue);
-        struct device *dev = musb->controller;
 
-        pm_runtime_get_sync(dev);
         omap_musb_set_mailbox(glue);
-        pm_runtime_mark_last_busy(dev);
-        pm_runtime_put_autosuspend(dev);
 }
 
 static irqreturn_t omap2430_musb_interrupt(int irq, void *__hci)
@@ -389,23 +336,7 @@ static int omap2430_musb_init(struct musb *musb)
                 return PTR_ERR(musb->phy);
         }
         musb->isr = omap2430_musb_interrupt;
-
-        /*
-         * Enable runtime PM for musb parent (this driver). We can't
-         * do it earlier as struct musb is not yet allocated and we
-         * need to touch the musb registers for runtime PM.
-         */
-        pm_runtime_enable(glue->dev);
-        status = pm_runtime_get_sync(glue->dev);
-        if (status < 0)
-                goto err1;
-
-        status = pm_runtime_get_sync(dev);
-        if (status < 0) {
-                dev_err(dev, "pm_runtime_get_sync FAILED %d\n", status);
-                pm_runtime_put_sync(glue->dev);
-                goto err1;
-        }
+        phy_init(musb->phy);
 
         l = musb_readl(musb->mregs, OTG_INTERFSEL);
 
@@ -427,20 +358,10 @@ static int omap2430_musb_init(struct musb *musb)
                         musb_readl(musb->mregs, OTG_INTERFSEL),
                         musb_readl(musb->mregs, OTG_SIMENABLE));
 
-        setup_timer(&musb_idle_timer, musb_do_idle, (unsigned long) musb);
-
         if (glue->status != MUSB_UNKNOWN)
                 omap_musb_set_mailbox(glue);
 
-        phy_init(musb->phy);
-        phy_power_on(musb->phy);
-
-        pm_runtime_put_noidle(musb->controller);
-        pm_runtime_put_noidle(glue->dev);
         return 0;
-
-err1:
-        return status;
 }
 
 static void omap2430_musb_enable(struct musb *musb)
@@ -452,6 +373,11 @@ static void omap2430_musb_enable(struct musb *musb)
         struct musb_hdrc_platform_data *pdata = dev_get_platdata(dev);
         struct omap_musb_board_data *data = pdata->board_data;
 
+        if (!WARN_ON(!musb->phy))
+                phy_power_on(musb->phy);
+
+        omap2430_set_power(musb, true, glue->cable_connected);
+
         switch (glue->status) {
 
         case MUSB_ID_GROUND:
@@ -487,18 +413,25 @@ static void omap2430_musb_disable(struct musb *musb)
         struct device *dev = musb->controller;
         struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
 
+        if (!WARN_ON(!musb->phy))
+                phy_power_off(musb->phy);
+
         if (glue->status != MUSB_UNKNOWN)
                 omap_control_usb_set_mode(glue->control_otghs,
                         USB_MODE_DISCONNECT);
+
+        omap2430_set_power(musb, false, glue->cable_connected);
 }
 
 static int omap2430_musb_exit(struct musb *musb)
 {
-        del_timer_sync(&musb_idle_timer);
+        struct device *dev = musb->controller;
+        struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
 
         omap2430_low_level_exit(musb);
-        phy_power_off(musb->phy);
         phy_exit(musb->phy);
+        musb->phy = NULL;
+        cancel_work_sync(&glue->omap_musb_mailbox_work);
 
         return 0;
 }
@@ -512,9 +445,6 @@ static const struct musb_platform_ops omap2430_ops = {
         .init           = omap2430_musb_init,
         .exit           = omap2430_musb_exit,
 
-        .set_mode       = omap2430_musb_set_mode,
-        .try_idle       = omap2430_musb_try_idle,
-
         .set_vbus       = omap2430_musb_set_vbus,
 
         .enable         = omap2430_musb_enable,
@@ -639,11 +569,9 @@ static int omap2430_probe(struct platform_device *pdev)
                 goto err2;
         }
 
-        /*
-         * Note that we cannot enable PM runtime yet for this
-         * driver as we need struct musb initialized first.
-         * See omap2430_musb_init above.
-         */
+        pm_runtime_enable(glue->dev);
+        pm_runtime_use_autosuspend(glue->dev);
+        pm_runtime_set_autosuspend_delay(glue->dev, 500);
 
         ret = platform_device_add(musb);
         if (ret) {
@@ -662,12 +590,14 @@ err0:
 
 static int omap2430_remove(struct platform_device *pdev)
 {
-        struct omap2430_glue            *glue = platform_get_drvdata(pdev);
+        struct omap2430_glue *glue = platform_get_drvdata(pdev);
+        struct musb *musb = glue_to_musb(glue);
 
         pm_runtime_get_sync(glue->dev);
-        cancel_work_sync(&glue->omap_musb_mailbox_work);
         platform_device_unregister(glue->musb);
+        omap2430_set_power(musb, false, false);
         pm_runtime_put_sync(glue->dev);
+        pm_runtime_dont_use_autosuspend(glue->dev);
         pm_runtime_disable(glue->dev);
 
         return 0;
@@ -680,12 +610,13 @@ static int omap2430_runtime_suspend(struct device *dev)
         struct omap2430_glue            *glue = dev_get_drvdata(dev);
         struct musb                     *musb = glue_to_musb(glue);
 
-        if (musb) {
-                musb->context.otg_interfsel = musb_readl(musb->mregs,
-                                OTG_INTERFSEL);
+        if (!musb)
+                return 0;
 
-                omap2430_low_level_exit(musb);
-        }
+        musb->context.otg_interfsel = musb_readl(musb->mregs,
+                                                 OTG_INTERFSEL);
+
+        omap2430_low_level_exit(musb);
 
         return 0;
 }
@@ -696,7 +627,7 @@ static int omap2430_runtime_resume(struct device *dev)
         struct musb                     *musb = glue_to_musb(glue);
 
         if (!musb)
-                return -EPROBE_DEFER;
+                return 0;
 
         omap2430_low_level_init(musb);
         musb_writel(musb->mregs, OTG_INTERFSEL,
@@ -738,18 +669,8 @@ static struct platform_driver omap2430_driver = {
         },
 };
 
+module_platform_driver(omap2430_driver);
+
 MODULE_DESCRIPTION("OMAP2PLUS MUSB Glue Layer");
 MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
 MODULE_LICENSE("GPL v2");
-
-static int __init omap2430_init(void)
-{
-        return platform_driver_register(&omap2430_driver);
-}
-subsys_initcall(omap2430_init);
-
-static void __exit omap2430_exit(void)
-{
-        platform_driver_unregister(&omap2430_driver);
-}
-module_exit(omap2430_exit);
diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
index fdab4232cfbf..76500515dd8b 100644
--- a/drivers/usb/musb/sunxi.c
+++ b/drivers/usb/musb/sunxi.c
@@ -80,7 +80,8 @@ static struct musb *sunxi_musb;
 
 struct sunxi_glue {
         struct device           *dev;
-        struct platform_device  *musb;
+        struct musb             *musb;
+        struct platform_device  *musb_pdev;
         struct clk              *clk;
         struct reset_control    *rst;
         struct phy              *phy;
@@ -102,7 +103,7 @@ static void sunxi_musb_work(struct work_struct *work)
                 return;
 
         if (test_and_clear_bit(SUNXI_MUSB_FL_HOSTMODE_PEND, &glue->flags)) {
-                struct musb *musb = platform_get_drvdata(glue->musb);
+                struct musb *musb = glue->musb;
                 unsigned long flags;
                 u8 devctl;
 
@@ -112,7 +113,7 @@ static void sunxi_musb_work(struct work_struct *work)
                 if (test_bit(SUNXI_MUSB_FL_HOSTMODE, &glue->flags)) {
                         set_bit(SUNXI_MUSB_FL_VBUS_ON, &glue->flags);
                         musb->xceiv->otg->default_a = 1;
-                        musb->xceiv->otg->state = OTG_STATE_A_IDLE;
+                        musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
                         MUSB_HST_MODE(musb);
                         devctl |= MUSB_DEVCTL_SESSION;
                 } else {
@@ -145,10 +146,12 @@ static void sunxi_musb_set_vbus(struct musb *musb, int is_on)
 {
         struct sunxi_glue *glue = dev_get_drvdata(musb->controller->parent);
 
-        if (is_on)
+        if (is_on) {
                 set_bit(SUNXI_MUSB_FL_VBUS_ON, &glue->flags);
-        else
+                musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
+        } else {
                 clear_bit(SUNXI_MUSB_FL_VBUS_ON, &glue->flags);
+        }
 
         schedule_work(&glue->work);
 }
@@ -264,15 +267,6 @@ static int sunxi_musb_init(struct musb *musb)
         if (ret)
                 goto error_unregister_notifier;
 
-        if (musb->port_mode == MUSB_PORT_MODE_HOST) {
-                ret = phy_power_on(glue->phy);
-                if (ret)
-                        goto error_phy_exit;
-                set_bit(SUNXI_MUSB_FL_PHY_ON, &glue->flags);
-                /* Stop musb work from turning vbus off again */
-                set_bit(SUNXI_MUSB_FL_VBUS_ON, &glue->flags);
-        }
-
         musb->isr = sunxi_musb_interrupt;
 
         /* Stop the musb-core from doing runtime pm (not supported on sunxi) */
@@ -280,8 +274,6 @@ static int sunxi_musb_init(struct musb *musb)
 
         return 0;
 
-error_phy_exit:
-        phy_exit(glue->phy);
 error_unregister_notifier:
         if (musb->port_mode == MUSB_PORT_MODE_DUAL_ROLE)
                 extcon_unregister_notifier(glue->extcon, EXTCON_USB_HOST,
@@ -323,10 +315,31 @@ static int sunxi_musb_exit(struct musb *musb)
         return 0;
 }
 
+static int sunxi_set_mode(struct musb *musb, u8 mode)
+{
+        struct sunxi_glue *glue = dev_get_drvdata(musb->controller->parent);
+        int ret;
+
+        if (mode == MUSB_HOST) {
+                ret = phy_power_on(glue->phy);
+                if (ret)
+                        return ret;
+
+                set_bit(SUNXI_MUSB_FL_PHY_ON, &glue->flags);
+                /* Stop musb work from turning vbus off again */
+                set_bit(SUNXI_MUSB_FL_VBUS_ON, &glue->flags);
+                musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
+        }
+
+        return 0;
+}
+
 static void sunxi_musb_enable(struct musb *musb)
 {
         struct sunxi_glue *glue = dev_get_drvdata(musb->controller->parent);
 
+        glue->musb = musb;
+
         /* musb_core does not call us in a balanced manner */
         if (test_and_set_bit(SUNXI_MUSB_FL_ENABLED, &glue->flags))
                 return;
@@ -569,6 +582,7 @@ static const struct musb_platform_ops sunxi_musb_ops = {
         .exit           = sunxi_musb_exit,
         .enable         = sunxi_musb_enable,
         .disable        = sunxi_musb_disable,
+        .set_mode       = sunxi_set_mode,
         .fifo_offset    = sunxi_musb_fifo_offset,
         .ep_offset      = sunxi_musb_ep_offset,
         .busctl_offset  = sunxi_musb_busctl_offset,
@@ -721,9 +735,9 @@ static int sunxi_musb_probe(struct platform_device *pdev)
         pinfo.data      = &pdata;
         pinfo.size_data = sizeof(pdata);
 
-        glue->musb = platform_device_register_full(&pinfo);
-        if (IS_ERR(glue->musb)) {
-                ret = PTR_ERR(glue->musb);
+        glue->musb_pdev = platform_device_register_full(&pinfo);
+        if (IS_ERR(glue->musb_pdev)) {
+                ret = PTR_ERR(glue->musb_pdev);
                 dev_err(&pdev->dev, "Error registering musb dev: %d\n", ret);
                 goto err_unregister_usb_phy;
         }
@@ -740,7 +754,7 @@ static int sunxi_musb_remove(struct platform_device *pdev)
         struct sunxi_glue *glue = platform_get_drvdata(pdev);
         struct platform_device *usb_phy = glue->usb_phy;
 
-        platform_device_unregister(glue->musb); /* Frees glue ! */
+        platform_device_unregister(glue->musb_pdev);
         usb_phy_generic_unregister(usb_phy);
 
         return 0;
diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
index 24e2b3cf1867..a72e8d670adc 100644
--- a/drivers/usb/phy/phy-twl6030-usb.c
+++ b/drivers/usb/phy/phy-twl6030-usb.c
@@ -97,6 +97,9 @@ struct twl6030_usb {
 
         struct regulator                *usb3v3;
 
+        /* used to check initial cable status after probe */
+        struct delayed_work     get_status_work;
+
         /* used to set vbus, in atomic path */
         struct work_struct      set_vbus_work;
 
@@ -227,12 +230,16 @@ static irqreturn_t twl6030_usb_irq(int irq, void *_twl)
                         twl->asleep = 1;
                         status = MUSB_VBUS_VALID;
                         twl->linkstat = status;
-                        musb_mailbox(status);
+                        ret = musb_mailbox(status);
+                        if (ret)
+                                twl->linkstat = MUSB_UNKNOWN;
                 } else {
                         if (twl->linkstat != MUSB_UNKNOWN) {
                                 status = MUSB_VBUS_OFF;
                                 twl->linkstat = status;
-                                musb_mailbox(status);
+                                ret = musb_mailbox(status);
+                                if (ret)
+                                        twl->linkstat = MUSB_UNKNOWN;
                                 if (twl->asleep) {
                                         regulator_disable(twl->usb3v3);
                                         twl->asleep = 0;
@@ -264,7 +271,9 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl)
                 twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_SET);
                 status = MUSB_ID_GROUND;
                 twl->linkstat = status;
-                musb_mailbox(status);
+                ret = musb_mailbox(status);
+                if (ret)
+                        twl->linkstat = MUSB_UNKNOWN;
         } else  {
                 twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_CLR);
                 twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_SET);
@@ -274,6 +283,15 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl)
         return IRQ_HANDLED;
 }
 
+static void twl6030_status_work(struct work_struct *work)
+{
+        struct twl6030_usb *twl = container_of(work, struct twl6030_usb,
+                                               get_status_work.work);
+
+        twl6030_usb_irq(twl->irq2, twl);
+        twl6030_usbotg_irq(twl->irq1, twl);
+}
+
 static int twl6030_enable_irq(struct twl6030_usb *twl)
 {
         twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_SET);
@@ -284,8 +302,6 @@ static int twl6030_enable_irq(struct twl6030_usb *twl)
                                 REG_INT_MSK_LINE_C);
         twl6030_interrupt_unmask(TWL6030_CHARGER_CTRL_INT_MASK,
                                 REG_INT_MSK_STS_C);
-        twl6030_usb_irq(twl->irq2, twl);
-        twl6030_usbotg_irq(twl->irq1, twl);
 
         return 0;
 }
@@ -371,6 +387,7 @@ static int twl6030_usb_probe(struct platform_device *pdev)
                 dev_warn(&pdev->dev, "could not create sysfs file\n");
 
         INIT_WORK(&twl->set_vbus_work, otg_set_vbus_work);
+        INIT_DELAYED_WORK(&twl->get_status_work, twl6030_status_work);
 
         status = request_threaded_irq(twl->irq1, NULL, twl6030_usbotg_irq,
                         IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING | IRQF_ONESHOT,
@@ -395,6 +412,7 @@ static int twl6030_usb_probe(struct platform_device *pdev)
 
         twl->asleep = 0;
         twl6030_enable_irq(twl);
+        schedule_delayed_work(&twl->get_status_work, HZ);
         dev_info(&pdev->dev, "Initialized TWL6030 USB module\n");
 
         return 0;
@@ -404,6 +422,7 @@ static int twl6030_usb_remove(struct platform_device *pdev)
 {
         struct twl6030_usb *twl = platform_get_drvdata(pdev);
 
+        cancel_delayed_work(&twl->get_status_work);
         twl6030_interrupt_mask(TWL6030_USBOTG_INT_MASK,
                 REG_INT_MSK_LINE_C);
         twl6030_interrupt_mask(TWL6030_USBOTG_INT_MASK,
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 2eddbe538cda..5608af4a369d 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -2007,6 +2007,7 @@ static void mos7720_release(struct usb_serial *serial)
                                     urblist_entry)
                         usb_unlink_urb(urbtrack->urb);
                 spin_unlock_irqrestore(&mos_parport->listlock, flags);
+                parport_del_port(mos_parport->pp);
 
                 kref_put(&mos_parport->ref_count, destroy_mos_parport);
         }
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 4d49fce406e1..5ef014ba6ae8 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -836,6 +836,7 @@ static int uas_slave_configure(struct scsi_device *sdev)
         if (devinfo->flags & US_FL_BROKEN_FUA)
                 sdev->broken_fua = 1;
 
+        scsi_change_queue_depth(sdev, devinfo->qdepth - 2);
         return 0;
 }
 
@@ -848,7 +849,6 @@ static struct scsi_host_template uas_host_template = {
         .slave_configure = uas_slave_configure,
         .eh_abort_handler = uas_eh_abort_handler,
         .eh_bus_reset_handler = uas_eh_bus_reset_handler,
-        .can_queue = MAX_CMNDS,
         .this_id = -1,
         .sg_tablesize = SG_NONE,
         .skip_settle_delay = 1,
diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
index fca51105974e..2e0450bec1b1 100644
--- a/drivers/usb/usbip/vhci_hcd.c
+++ b/drivers/usb/usbip/vhci_hcd.c
@@ -941,7 +941,7 @@ static void vhci_stop(struct usb_hcd *hcd)
 
 static int vhci_get_frame_number(struct usb_hcd *hcd)
 {
-        pr_err("Not yet implemented\n");
+        dev_err_ratelimited(&hcd->self.root_hub->dev, "Not yet implemented\n");
         return 0;
 }
 
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index b54f26c55dfd..b4b3e256491b 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -746,7 +746,7 @@ config ALIM7101_WDT
 
 config EBC_C384_WDT
         tristate "WinSystems EBC-C384 Watchdog Timer"
-        depends on X86 && ISA
+        depends on X86 && ISA_BUS_API
         select WATCHDOG_CORE
         help
           Enables watchdog timer support for the watchdog timer on the
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index b677a6ea6001..7706c8dc5fa6 100644
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -2645,7 +2645,7 @@ static void btrfsic_dump_tree_sub(const struct btrfsic_state *state,
          * This algorithm is recursive because the amount of used stack space
          * is very small and the max recursion depth is limited.
          */
-        indent_add = sprintf(buf, "%c-%llu(%s/%llu/%d)",
+        indent_add = sprintf(buf, "%c-%llu(%s/%llu/%u)",
                              btrfsic_get_block_type(state, block),
                              block->logical_bytenr, block->dev_state->name,
                              block->dev_bytenr, block->mirror_num);
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 46025688f1d0..6276add8538a 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1554,6 +1554,7 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans,
                        trans->transid, root->fs_info->generation);
 
         if (!should_cow_block(trans, root, buf)) {
+                trans->dirty = true;
                 *cow_ret = buf;
                 return 0;
         }
@@ -2512,6 +2513,8 @@ read_block_for_search(struct btrfs_trans_handle *trans,
                 if (!btrfs_buffer_uptodate(tmp, 0, 0))
                         ret = -EIO;
                 free_extent_buffer(tmp);
+        } else {
+                ret = PTR_ERR(tmp);
         }
         return ret;
 }
@@ -2775,8 +2778,10 @@ again:
                          * then we don't want to set the path blocking,
                          * so we test it here
                          */
-                        if (!should_cow_block(trans, root, b))
+                        if (!should_cow_block(trans, root, b)) {
+                                trans->dirty = true;
                                 goto cow_done;
+                        }
 
                         /*
                          * must have write locks on this node and the
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 1142127f6e5e..54cca7a1572b 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1098,7 +1098,7 @@ void readahead_tree_block(struct btrfs_root *root, u64 bytenr)
         struct inode *btree_inode = root->fs_info->btree_inode;
 
         buf = btrfs_find_create_tree_block(root, bytenr);
-        if (!buf)
+        if (IS_ERR(buf))
                 return;
         read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree,
                                  buf, 0, WAIT_NONE, btree_get_extent, 0);
@@ -1114,7 +1114,7 @@ int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr,
         int ret;
 
         buf = btrfs_find_create_tree_block(root, bytenr);
-        if (!buf)
+        if (IS_ERR(buf))
                 return 0;
 
         set_bit(EXTENT_BUFFER_READAHEAD, &buf->bflags);
@@ -1172,8 +1172,8 @@ struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
         int ret;
 
         buf = btrfs_find_create_tree_block(root, bytenr);
-        if (!buf)
-                return ERR_PTR(-ENOMEM);
+        if (IS_ERR(buf))
+                return buf;
 
         ret = btree_read_extent_buffer_pages(root, buf, 0, parent_transid);
         if (ret) {
@@ -1806,6 +1806,13 @@ static int cleaner_kthread(void *arg)
                 if (btrfs_need_cleaner_sleep(root))
                         goto sleep;
 
+                /*
+                 * Do not do anything if we might cause open_ctree() to block
+                 * before we have finished mounting the filesystem.
+                 */
+                if (!root->fs_info->open)
+                        goto sleep;
+
                 if (!mutex_trylock(&root->fs_info->cleaner_mutex))
                         goto sleep;
 
@@ -2520,7 +2527,6 @@ int open_ctree(struct super_block *sb,
         int num_backups_tried = 0;
         int backup_index = 0;
         int max_active;
-        bool cleaner_mutex_locked = false;
 
         tree_root = fs_info->tree_root = btrfs_alloc_root(fs_info, GFP_KERNEL);
         chunk_root = fs_info->chunk_root = btrfs_alloc_root(fs_info, GFP_KERNEL);
@@ -2999,13 +3005,6 @@ retry_root_backup:
                 goto fail_sysfs;
         }
 
-        /*
-         * Hold the cleaner_mutex thread here so that we don't block
-         * for a long time on btrfs_recover_relocation.  cleaner_kthread
-         * will wait for us to finish mounting the filesystem.
-         */
-        mutex_lock(&fs_info->cleaner_mutex);
-        cleaner_mutex_locked = true;
         fs_info->cleaner_kthread = kthread_run(cleaner_kthread, tree_root,
                                                "btrfs-cleaner");
         if (IS_ERR(fs_info->cleaner_kthread))
@@ -3065,8 +3064,10 @@ retry_root_backup:
                 ret = btrfs_cleanup_fs_roots(fs_info);
                 if (ret)
                         goto fail_qgroup;
-                /* We locked cleaner_mutex before creating cleaner_kthread. */
+
+                mutex_lock(&fs_info->cleaner_mutex);
                 ret = btrfs_recover_relocation(tree_root);
+                mutex_unlock(&fs_info->cleaner_mutex);
                 if (ret < 0) {
                         btrfs_warn(fs_info, "failed to recover relocation: %d",
                                         ret);
@@ -3074,8 +3075,6 @@ retry_root_backup:
                         goto fail_qgroup;
                 }
         }
-        mutex_unlock(&fs_info->cleaner_mutex);
-        cleaner_mutex_locked = false;
 
         location.objectid = BTRFS_FS_TREE_OBJECTID;
         location.type = BTRFS_ROOT_ITEM_KEY;
@@ -3189,10 +3188,6 @@ fail_cleaner:
         filemap_write_and_wait(fs_info->btree_inode->i_mapping);
 
 fail_sysfs:
-        if (cleaner_mutex_locked) {
-                mutex_unlock(&fs_info->cleaner_mutex);
-                cleaner_mutex_locked = false;
-        }
         btrfs_sysfs_remove_mounted(fs_info);
 
 fail_fsdev_sysfs:
@@ -4139,7 +4134,8 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
                 ret = -EINVAL;
         }
         if (!is_power_of_2(btrfs_super_stripesize(sb)) ||
-            btrfs_super_stripesize(sb) != sectorsize) {
+                ((btrfs_super_stripesize(sb) != sectorsize) &&
+                        (btrfs_super_stripesize(sb) != 4096))) {
                 btrfs_err(fs_info, "invalid stripesize %u",
                        btrfs_super_stripesize(sb));
                 ret = -EINVAL;
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 689d25ac6a68..29e5d000bbee 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -8016,8 +8016,9 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,
         struct extent_buffer *buf;
 
         buf = btrfs_find_create_tree_block(root, bytenr);
-        if (!buf)
-                return ERR_PTR(-ENOMEM);
+        if (IS_ERR(buf))
+                return buf;
+
         btrfs_set_header_generation(buf, trans->transid);
         btrfs_set_buffer_lockdep_class(root->root_key.objectid, buf, level);
         btrfs_tree_lock(buf);
@@ -8044,7 +8045,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                 set_extent_dirty(&trans->transaction->dirty_pages, buf->start,
                          buf->start + buf->len - 1, GFP_NOFS);
         }
-        trans->blocks_used++;
+        trans->dirty = true;
         /* this returns a buffer locked for blocking */
         return buf;
 }
@@ -8659,8 +8660,9 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
         next = btrfs_find_tree_block(root->fs_info, bytenr);
         if (!next) {
                 next = btrfs_find_create_tree_block(root, bytenr);
-                if (!next)
-                        return -ENOMEM;
+                if (IS_ERR(next))
+                        return PTR_ERR(next);
+
                 btrfs_set_buffer_lockdep_class(root->root_key.objectid, next,
                                                level - 1);
                 reada = 1;
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index a3412d68ad37..aaee3ef55ed8 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -4892,18 +4892,25 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
         int uptodate = 1;
         int ret;
 
+        if (!IS_ALIGNED(start, fs_info->tree_root->sectorsize)) {
+                btrfs_err(fs_info, "bad tree block start %llu", start);
+                return ERR_PTR(-EINVAL);
+        }
+
         eb = find_extent_buffer(fs_info, start);
         if (eb)
                 return eb;
 
         eb = __alloc_extent_buffer(fs_info, start, len);
         if (!eb)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         for (i = 0; i < num_pages; i++, index++) {
                 p = find_or_create_page(mapping, index, GFP_NOFS|__GFP_NOFAIL);
-                if (!p)
+                if (!p) {
+                        exists = ERR_PTR(-ENOMEM);
                         goto free_eb;
+                }
 
                 spin_lock(&mapping->private_lock);
                 if (PagePrivate(p)) {
@@ -4948,8 +4955,10 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
                 set_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags);
 again:
         ret = radix_tree_preload(GFP_NOFS);
-        if (ret)
+        if (ret) {
+                exists = ERR_PTR(ret);
                 goto free_eb;
+        }
 
         spin_lock(&fs_info->buffer_lock);
         ret = radix_tree_insert(&fs_info->buffer_radix,
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8b1212e8f7a8..d2be95cfb6d1 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3271,7 +3271,16 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode)
         /* grab metadata reservation from transaction handle */
         if (reserve) {
                 ret = btrfs_orphan_reserve_metadata(trans, inode);
-                BUG_ON(ret); /* -ENOSPC in reservation; Logic error? JDM */
+                ASSERT(!ret);
+                if (ret) {
+                        atomic_dec(&root->orphan_inodes);
+                        clear_bit(BTRFS_INODE_ORPHAN_META_RESERVED,
+                                  &BTRFS_I(inode)->runtime_flags);
+                        if (insert)
+                                clear_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
+                                          &BTRFS_I(inode)->runtime_flags);
+                        return ret;
+                }
         }
 
         /* insert an orphan item to track this unlinked/truncated file */
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 4339b6613f19..60e7179ed4b7 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -235,7 +235,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
         trans->aborted = errno;
         /* Nothing used. The other threads that have joined this
          * transaction may be able to continue. */
-        if (!trans->blocks_used && list_empty(&trans->new_bgs)) {
+        if (!trans->dirty && list_empty(&trans->new_bgs)) {
                 const char *errstr;
 
                 errstr = btrfs_decode_error(errno);
@@ -1807,6 +1807,8 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data)
                         }
                 }
                 sb->s_flags &= ~MS_RDONLY;
+
+                fs_info->open = 1;
         }
 out:
         wake_up_process(fs_info->transaction_kthread);
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index f6e24cb423ae..765845742fde 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1311,11 +1311,6 @@ int btrfs_defrag_root(struct btrfs_root *root)
         return ret;
 }
 
-/* Bisesctability fixup, remove in 4.8 */
-#ifndef btrfs_std_error
-#define btrfs_std_error btrfs_handle_fs_error
-#endif
-
 /*
  * Do all special snapshot related qgroup dirty hack.
  *
@@ -1385,7 +1380,7 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans,
         switch_commit_roots(trans->transaction, fs_info);
         ret = btrfs_write_and_wait_transaction(trans, src);
         if (ret)
-                btrfs_std_error(fs_info, ret,
+                btrfs_handle_fs_error(fs_info, ret,
                         "Error while writing out transaction for qgroup");
 
 out:
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index 9fe0ec2bf0fe..c5abee4f01ad 100644
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -110,7 +110,6 @@ struct btrfs_trans_handle {
         u64 chunk_bytes_reserved;
         unsigned long use_count;
         unsigned long blocks_reserved;
-        unsigned long blocks_used;
         unsigned long delayed_ref_updates;
         struct btrfs_transaction *transaction;
         struct btrfs_block_rsv *block_rsv;
@@ -121,6 +120,7 @@ struct btrfs_trans_handle {
         bool can_flush_pending_bgs;
         bool reloc_reserved;
         bool sync;
+        bool dirty;
         unsigned int type;
         /*
          * this root is only needed to validate that the root passed to
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index b7665af471d8..c05f69a8ec42 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2422,8 +2422,8 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,
                 root_owner = btrfs_header_owner(parent);
 
                 next = btrfs_find_create_tree_block(root, bytenr);
-                if (!next)
-                        return -ENOMEM;
+                if (IS_ERR(next))
+                        return PTR_ERR(next);
 
                 if (*level == 1) {
                         ret = wc->process_func(root, next, wc, ptr_gen);
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 548faaa9e169..2f631b58ae00 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -6607,8 +6607,8 @@ int btrfs_read_sys_array(struct btrfs_root *root)
          * overallocate but we can keep it as-is, only the first page is used.
          */
         sb = btrfs_find_create_tree_block(root, BTRFS_SUPER_INFO_OFFSET);
-        if (!sb)
-                return -ENOMEM;
+        if (IS_ERR(sb))
+                return PTR_ERR(sb);
         set_extent_buffer_uptodate(sb);
         btrfs_set_buffer_lockdep_class(root->root_key.objectid, sb, 0);
         /*
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index 9c1c9a01b7e5..592059f88e04 100644
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -127,7 +127,6 @@ static int open_proxy_open(struct inode *inode, struct file *filp)
                 r = real_fops->open(inode, filp);
 
 out:
-        fops_put(real_fops);
         debugfs_use_file_finish(srcu_idx);
         return r;
 }
@@ -262,8 +261,10 @@ static int full_proxy_open(struct inode *inode, struct file *filp)
 
         if (real_fops->open) {
                 r = real_fops->open(inode, filp);
-
-                if (filp->f_op != proxy_fops) {
+                if (r) {
+                        replace_fops(filp, d_inode(dentry)->i_fop);
+                        goto free_proxy;
+                } else if (filp->f_op != proxy_fops) {
                         /* No protection against file removal anymore. */
                         WARN(1, "debugfs file owner replaced proxy fops: %pd",
                                 dentry);
diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
index e55b5242614d..31f3df193bdb 100644
--- a/fs/nfsd/blocklayout.c
+++ b/fs/nfsd/blocklayout.c
@@ -290,7 +290,7 @@ out_free_buf:
         return error;
 }
 
-#define NFSD_MDS_PR_KEY         0x0100000000000000
+#define NFSD_MDS_PR_KEY         0x0100000000000000ULL
 
 /*
  * We use the client ID as a unique key for the reservations.
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 7389cb1d7409..04c68d900324 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -710,22 +710,6 @@ static struct rpc_cred *get_backchannel_cred(struct nfs4_client *clp, struct rpc
         }
 }
 
-static struct rpc_clnt *create_backchannel_client(struct rpc_create_args *args)
-{
-        struct rpc_xprt *xprt;
-
-        if (args->protocol != XPRT_TRANSPORT_BC_TCP)
-                return rpc_create(args);
-
-        xprt = args->bc_xprt->xpt_bc_xprt;
-        if (xprt) {
-                xprt_get(xprt);
-                return rpc_create_xprt(args, xprt);
-        }
-
-        return rpc_create(args);
-}
-
 static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *conn, struct nfsd4_session *ses)
 {
         int maxtime = max_cb_time(clp->net);
@@ -768,7 +752,7 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c
                 args.authflavor = ses->se_cb_sec.flavor;
         }
         /* Create RPC client */
-        client = create_backchannel_client(&args);
+        client = rpc_create(&args);
         if (IS_ERR(client)) {
                 dprintk("NFSD: couldn't create callback client: %ld\n",
                         PTR_ERR(client));
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index f5f82e145018..70d0b9b33031 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3480,12 +3480,17 @@ alloc_init_open_stateowner(unsigned int strhashval, struct nfsd4_open *open,
 }
 
 static struct nfs4_ol_stateid *
-init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp,
-                struct nfsd4_open *open)
+init_open_stateid(struct nfs4_file *fp, struct nfsd4_open *open)
 {
 
         struct nfs4_openowner *oo = open->op_openowner;
         struct nfs4_ol_stateid *retstp = NULL;
+        struct nfs4_ol_stateid *stp;
+
+        stp = open->op_stp;
+        /* We are moving these outside of the spinlocks to avoid the warnings */
+        mutex_init(&stp->st_mutex);
+        mutex_lock(&stp->st_mutex);
 
         spin_lock(&oo->oo_owner.so_client->cl_lock);
         spin_lock(&fp->fi_lock);
@@ -3493,6 +3498,8 @@ init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp,
         retstp = nfsd4_find_existing_open(fp, open);
         if (retstp)
                 goto out_unlock;
+
+        open->op_stp = NULL;
         atomic_inc(&stp->st_stid.sc_count);
         stp->st_stid.sc_type = NFS4_OPEN_STID;
         INIT_LIST_HEAD(&stp->st_locks);
@@ -3502,14 +3509,19 @@ init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp,
         stp->st_access_bmap = 0;
         stp->st_deny_bmap = 0;
         stp->st_openstp = NULL;
-        init_rwsem(&stp->st_rwsem);
         list_add(&stp->st_perstateowner, &oo->oo_owner.so_stateids);
         list_add(&stp->st_perfile, &fp->fi_stateids);
 
 out_unlock:
         spin_unlock(&fp->fi_lock);
         spin_unlock(&oo->oo_owner.so_client->cl_lock);
-        return retstp;
+        if (retstp) {
+                mutex_lock(&retstp->st_mutex);
+                /* To keep mutex tracking happy */
+                mutex_unlock(&stp->st_mutex);
+                stp = retstp;
+        }
+        return stp;
 }
 
 /*
@@ -4305,7 +4317,6 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
         struct nfs4_client *cl = open->op_openowner->oo_owner.so_client;
         struct nfs4_file *fp = NULL;
         struct nfs4_ol_stateid *stp = NULL;
-        struct nfs4_ol_stateid *swapstp = NULL;
         struct nfs4_delegation *dp = NULL;
         __be32 status;
 
@@ -4335,32 +4346,28 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
          */
         if (stp) {
                 /* Stateid was found, this is an OPEN upgrade */
-                down_read(&stp->st_rwsem);
+                mutex_lock(&stp->st_mutex);
                 status = nfs4_upgrade_open(rqstp, fp, current_fh, stp, open);
                 if (status) {
-                        up_read(&stp->st_rwsem);
+                        mutex_unlock(&stp->st_mutex);
                         goto out;
                 }
         } else {
-                stp = open->op_stp;
-                open->op_stp = NULL;
-                swapstp = init_open_stateid(stp, fp, open);
-                if (swapstp) {
-                        nfs4_put_stid(&stp->st_stid);
-                        stp = swapstp;
-                        down_read(&stp->st_rwsem);
+                /* stp is returned locked. */
+                stp = init_open_stateid(fp, open);
+                /* See if we lost the race to some other thread */
+                if (stp->st_access_bmap != 0) {
                         status = nfs4_upgrade_open(rqstp, fp, current_fh,
                                                 stp, open);
                         if (status) {
-                                up_read(&stp->st_rwsem);
+                                mutex_unlock(&stp->st_mutex);
                                 goto out;
                         }
                         goto upgrade_out;
                 }
-                down_read(&stp->st_rwsem);
                 status = nfs4_get_vfs_file(rqstp, fp, current_fh, stp, open);
                 if (status) {
-                        up_read(&stp->st_rwsem);
+                        mutex_unlock(&stp->st_mutex);
                         release_open_stateid(stp);
                         goto out;
                 }
@@ -4372,7 +4379,7 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
         }
 upgrade_out:
         nfs4_inc_and_copy_stateid(&open->op_stateid, &stp->st_stid);
-        up_read(&stp->st_rwsem);
+        mutex_unlock(&stp->st_mutex);
 
         if (nfsd4_has_session(&resp->cstate)) {
                 if (open->op_deleg_want & NFS4_SHARE_WANT_NO_DELEG) {
@@ -4977,12 +4984,12 @@ static __be32 nfs4_seqid_op_checks(struct nfsd4_compound_state *cstate, stateid_
                  * revoked delegations are kept only for free_stateid.
                  */
                 return nfserr_bad_stateid;
-        down_write(&stp->st_rwsem);
+        mutex_lock(&stp->st_mutex);
         status = check_stateid_generation(stateid, &stp->st_stid.sc_stateid, nfsd4_has_session(cstate));
         if (status == nfs_ok)
                 status = nfs4_check_fh(current_fh, &stp->st_stid);
         if (status != nfs_ok)
-                up_write(&stp->st_rwsem);
+                mutex_unlock(&stp->st_mutex);
         return status;
 }
 
@@ -5030,7 +5037,7 @@ static __be32 nfs4_preprocess_confirmed_seqid_op(struct nfsd4_compound_state *cs
                 return status;
         oo = openowner(stp->st_stateowner);
         if (!(oo->oo_flags & NFS4_OO_CONFIRMED)) {
-                up_write(&stp->st_rwsem);
+                mutex_unlock(&stp->st_mutex);
                 nfs4_put_stid(&stp->st_stid);
                 return nfserr_bad_stateid;
         }
@@ -5062,12 +5069,12 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
         oo = openowner(stp->st_stateowner);
         status = nfserr_bad_stateid;
         if (oo->oo_flags & NFS4_OO_CONFIRMED) {
-                up_write(&stp->st_rwsem);
+                mutex_unlock(&stp->st_mutex);
                 goto put_stateid;
         }
         oo->oo_flags |= NFS4_OO_CONFIRMED;
         nfs4_inc_and_copy_stateid(&oc->oc_resp_stateid, &stp->st_stid);
-        up_write(&stp->st_rwsem);
+        mutex_unlock(&stp->st_mutex);
         dprintk("NFSD: %s: success, seqid=%d stateid=" STATEID_FMT "\n",
                 __func__, oc->oc_seqid, STATEID_VAL(&stp->st_stid.sc_stateid));
 
@@ -5143,7 +5150,7 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp,
         nfs4_inc_and_copy_stateid(&od->od_stateid, &stp->st_stid);
         status = nfs_ok;
 put_stateid:
-        up_write(&stp->st_rwsem);
+        mutex_unlock(&stp->st_mutex);
         nfs4_put_stid(&stp->st_stid);
 out:
         nfsd4_bump_seqid(cstate, status);
@@ -5196,7 +5203,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
         if (status)
                 goto out; 
         nfs4_inc_and_copy_stateid(&close->cl_stateid, &stp->st_stid);
-        up_write(&stp->st_rwsem);
+        mutex_unlock(&stp->st_mutex);
 
         nfsd4_close_open_stateid(stp);
 
@@ -5422,7 +5429,7 @@ init_lock_stateid(struct nfs4_ol_stateid *stp, struct nfs4_lockowner *lo,
         stp->st_access_bmap = 0;
         stp->st_deny_bmap = open_stp->st_deny_bmap;
         stp->st_openstp = open_stp;
-        init_rwsem(&stp->st_rwsem);
+        mutex_init(&stp->st_mutex);
         list_add(&stp->st_locks, &open_stp->st_locks);
         list_add(&stp->st_perstateowner, &lo->lo_owner.so_stateids);
         spin_lock(&fp->fi_lock);
@@ -5591,7 +5598,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                                         &open_stp, nn);
                 if (status)
                         goto out;
-                up_write(&open_stp->st_rwsem);
+                mutex_unlock(&open_stp->st_mutex);
                 open_sop = openowner(open_stp->st_stateowner);
                 status = nfserr_bad_stateid;
                 if (!same_clid(&open_sop->oo_owner.so_client->cl_clientid,
@@ -5600,7 +5607,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                 status = lookup_or_create_lock_state(cstate, open_stp, lock,
                                                         &lock_stp, &new);
                 if (status == nfs_ok)
-                        down_write(&lock_stp->st_rwsem);
+                        mutex_lock(&lock_stp->st_mutex);
         } else {
                 status = nfs4_preprocess_seqid_op(cstate,
                                        lock->lk_old_lock_seqid,
@@ -5704,7 +5711,7 @@ out:
                     seqid_mutating_err(ntohl(status)))
                         lock_sop->lo_owner.so_seqid++;
 
-                up_write(&lock_stp->st_rwsem);
+                mutex_unlock(&lock_stp->st_mutex);
 
                 /*
                  * If this is a new, never-before-used stateid, and we are
@@ -5874,7 +5881,7 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 fput:
         fput(filp);
 put_stateid:
-        up_write(&stp->st_rwsem);
+        mutex_unlock(&stp->st_mutex);
         nfs4_put_stid(&stp->st_stid);
 out:
         nfsd4_bump_seqid(cstate, status);
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 986e51e5ceac..64053eadeb81 100644
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -535,7 +535,7 @@ struct nfs4_ol_stateid {
         unsigned char                   st_access_bmap;
         unsigned char                   st_deny_bmap;
         struct nfs4_ol_stateid          *st_openstp;
-        struct rw_semaphore             st_rwsem;
+        struct mutex                    st_mutex;
 };
 
 static inline struct nfs4_ol_stateid *openlockstateid(struct nfs4_stid *s)
diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index 22f0253a3567..c2a6b0894022 100644
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -405,12 +405,21 @@ static int ovl_create_or_link(struct dentry *dentry, int mode, dev_t rdev,
                 err = ovl_create_upper(dentry, inode, &stat, link, hardlink);
         } else {
                 const struct cred *old_cred;
+                struct cred *override_cred;
 
                 old_cred = ovl_override_creds(dentry->d_sb);
 
-                err = ovl_create_over_whiteout(dentry, inode, &stat, link,
-                                               hardlink);
+                err = -ENOMEM;
+                override_cred = prepare_creds();
+                if (override_cred) {
+                        override_cred->fsuid = old_cred->fsuid;
+                        override_cred->fsgid = old_cred->fsgid;
+                        put_cred(override_creds(override_cred));
+                        put_cred(override_cred);
 
+                        err = ovl_create_over_whiteout(dentry, inode, &stat,
+                                                       link, hardlink);
+                }
                 revert_creds(old_cred);
         }
 
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 0ed7c4012437..1dbeab6cf96e 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -238,41 +238,27 @@ out:
         return err;
 }
 
-static bool ovl_need_xattr_filter(struct dentry *dentry,
-                                  enum ovl_path_type type)
-{
-        if ((type & (__OVL_PATH_PURE | __OVL_PATH_UPPER)) == __OVL_PATH_UPPER)
-                return S_ISDIR(dentry->d_inode->i_mode);
-        else
-                return false;
-}
-
 ssize_t ovl_getxattr(struct dentry *dentry, struct inode *inode,
                      const char *name, void *value, size_t size)
 {
-        struct path realpath;
-        enum ovl_path_type type = ovl_path_real(dentry, &realpath);
+        struct dentry *realdentry = ovl_dentry_real(dentry);
 
-        if (ovl_need_xattr_filter(dentry, type) && ovl_is_private_xattr(name))
+        if (ovl_is_private_xattr(name))
                 return -ENODATA;
 
-        return vfs_getxattr(realpath.dentry, name, value, size);
+        return vfs_getxattr(realdentry, name, value, size);
 }
 
 ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)
 {
-        struct path realpath;
-        enum ovl_path_type type = ovl_path_real(dentry, &realpath);
+        struct dentry *realdentry = ovl_dentry_real(dentry);
         ssize_t res;
         int off;
 
-        res = vfs_listxattr(realpath.dentry, list, size);
+        res = vfs_listxattr(realdentry, list, size);
         if (res <= 0 || size == 0)
                 return res;
 
-        if (!ovl_need_xattr_filter(dentry, type))
-                return res;
-
         /* filter out private xattrs */
         for (off = 0; off < res;) {
                 char *s = list + off;
@@ -302,7 +288,7 @@ int ovl_removexattr(struct dentry *dentry, const char *name)
                 goto out;
 
         err = -ENODATA;
-        if (ovl_need_xattr_filter(dentry, type) && ovl_is_private_xattr(name))
+        if (ovl_is_private_xattr(name))
                 goto out_drop_write;
 
         if (!OVL_TYPE_UPPER(type)) {
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 484c8792da82..f28100f6b556 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -575,5 +575,17 @@ static inline struct inode *vfs_select_inode(struct dentry *dentry,
         return inode;
 }
 
+/**
+ * d_real_inode - Return the real inode
+ * @dentry: The dentry to query
+ *
+ * If dentry is on an union/overlay, then return the underlying, real inode.
+ * Otherwise return d_inode().
+ */
+static inline struct inode *d_real_inode(struct dentry *dentry)
+{
+        return d_backing_inode(d_real(dentry));
+}
+
 
 #endif  /* __LINUX_DCACHE_H */
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index d029ffac0d69..99403b19092f 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -223,6 +223,8 @@ struct st_sensor_settings {
  * @get_irq_data_ready: Function to get the IRQ used for data ready signal.
  * @tf: Transfer function structure used by I/O operations.
  * @tb: Transfer buffers and mutex used by I/O operations.
+ * @hw_irq_trigger: if we're using the hardware interrupt on the sensor.
+ * @hw_timestamp: Latest timestamp from the interrupt handler, when in use.
  */
 struct st_sensor_data {
         struct device *dev;
@@ -247,6 +249,9 @@ struct st_sensor_data {
 
         const struct st_sensor_transfer_function *tf;
         struct st_sensor_transfer_buffer tb;
+
+        bool hw_irq_trigger;
+        s64 hw_timestamp;
 };
 
 #ifdef CONFIG_IIO_BUFFER
@@ -260,7 +265,8 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
                                 const struct iio_trigger_ops *trigger_ops);
 
 void st_sensors_deallocate_trigger(struct iio_dev *indio_dev);
-
+int st_sensors_validate_device(struct iio_trigger *trig,
+                               struct iio_dev *indio_dev);
 #else
 static inline int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
                                 const struct iio_trigger_ops *trigger_ops)
@@ -271,6 +277,7 @@ static inline void st_sensors_deallocate_trigger(struct iio_dev *indio_dev)
 {
         return;
 }
+#define st_sensors_validate_device NULL
 #endif
 
 int st_sensors_init_sensor(struct iio_dev *indio_dev,
diff --git a/include/linux/isa.h b/include/linux/isa.h
index 5ab85281230b..f2d0258414cf 100644
--- a/include/linux/isa.h
+++ b/include/linux/isa.h
@@ -6,6 +6,7 @@
 #define __LINUX_ISA_H
 
 #include <linux/device.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 struct isa_driver {
@@ -22,13 +23,13 @@ struct isa_driver {
 
 #define to_isa_driver(x) container_of((x), struct isa_driver, driver)
 
-#ifdef CONFIG_ISA
+#ifdef CONFIG_ISA_BUS_API
 int isa_register_driver(struct isa_driver *, unsigned int);
 void isa_unregister_driver(struct isa_driver *);
 #else
 static inline int isa_register_driver(struct isa_driver *d, unsigned int i)
 {
-        return 0;
+        return -ENODEV;
 }
 
 static inline void isa_unregister_driver(struct isa_driver *d)
diff --git a/include/linux/leds.h b/include/linux/leds.h
index d2b13066e781..e5e7f2e80a54 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -42,15 +42,16 @@ struct led_classdev {
 #define LED_UNREGISTERING       (1 << 1)
         /* Upper 16 bits reflect control information */
 #define LED_CORE_SUSPENDRESUME  (1 << 16)
-#define LED_BLINK_ONESHOT       (1 << 17)
-#define LED_BLINK_ONESHOT_STOP  (1 << 18)
-#define LED_BLINK_INVERT        (1 << 19)
-#define LED_BLINK_BRIGHTNESS_CHANGE (1 << 20)
-#define LED_BLINK_DISABLE       (1 << 21)
-#define LED_SYSFS_DISABLE       (1 << 22)
-#define LED_DEV_CAP_FLASH       (1 << 23)
-#define LED_HW_PLUGGABLE        (1 << 24)
-#define LED_PANIC_INDICATOR     (1 << 25)
+#define LED_BLINK_SW            (1 << 17)
+#define LED_BLINK_ONESHOT       (1 << 18)
+#define LED_BLINK_ONESHOT_STOP  (1 << 19)
+#define LED_BLINK_INVERT        (1 << 20)
+#define LED_BLINK_BRIGHTNESS_CHANGE (1 << 21)
+#define LED_BLINK_DISABLE       (1 << 22)
+#define LED_SYSFS_DISABLE       (1 << 23)
+#define LED_DEV_CAP_FLASH       (1 << 24)
+#define LED_HW_PLUGGABLE        (1 << 25)
+#define LED_PANIC_INDICATOR     (1 << 26)
 
         /* Set LED brightness level
          * Must not sleep. Use brightness_set_blocking for drivers
@@ -72,8 +73,8 @@ struct led_classdev {
          * and if both are zero then a sensible default should be chosen.
          * The call should adjust the timings in that case and if it can't
          * match the values specified exactly.
-         * Deactivate blinking again when the brightness is set to a fixed
-         * value via the brightness_set() callback.
+         * Deactivate blinking again when the brightness is set to LED_OFF
+         * via the brightness_set() callback.
          */
         int             (*blink_set)(struct led_classdev *led_cdev,
                                      unsigned long *delay_on,
diff --git a/include/linux/pwm.h b/include/linux/pwm.h
index 17018f3c066e..908b67c847cd 100644
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@ -235,6 +235,9 @@ static inline int pwm_config(struct pwm_device *pwm, int duty_ns,
         if (!pwm)
                 return -EINVAL;
 
+        if (duty_ns < 0 || period_ns < 0)
+                return -EINVAL;
+
         pwm_get_state(pwm, &state);
         if (state.duty_cycle == duty_ns && state.period == period_ns)
                 return 0;
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 19c659d1c0f8..b6810c92b8bb 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -137,8 +137,6 @@ struct rpc_create_args {
 #define RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT      (1UL << 9)
 
 struct rpc_clnt *rpc_create(struct rpc_create_args *args);
-struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,
-                                        struct rpc_xprt *xprt);
 struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *,
                                 const struct rpc_program *, u32);
 struct rpc_clnt *rpc_clone_client(struct rpc_clnt *);
diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index b7dabc4baafd..79ba50856707 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -84,6 +84,7 @@ struct svc_xprt {
 
         struct net              *xpt_net;
         struct rpc_xprt         *xpt_bc_xprt;   /* NFSv4.1 backchannel */
+        struct rpc_xprt_switch  *xpt_bc_xps;    /* NFSv4.1 backchannel */
 };
 
 static inline void unregister_xpt_user(struct svc_xprt *xpt, struct svc_xpt_user *u)
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 5aa3834619a8..5e3e1b63dbb3 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -297,6 +297,7 @@ struct xprt_create {
         size_t                  addrlen;
         const char              *servername;
         struct svc_xprt         *bc_xprt;       /* NFSv4.1 backchannel */
+        struct rpc_xprt_switch  *bc_xps;
         unsigned int            flags;
 };
 
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 457651bf45b0..fefe8b06a63d 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -1034,6 +1034,8 @@ static inline int usb_gadget_activate(struct usb_gadget *gadget)
  * @udc_name: A name of UDC this driver should be bound to. If udc_name is NULL,
  *      this driver will be bound to any available UDC.
  * @pending: UDC core private data used for deferred probe of this driver.
+ * @match_existing_only: If udc is not found, return an error and don't add this
+ *      gadget driver to list of pending driver
  *
  * Devices are disabled till a gadget driver successfully bind()s, which
  * means the driver will handle setup() requests needed to enumerate (and
@@ -1097,6 +1099,7 @@ struct usb_gadget_driver {
 
         char                    *udc_name;
         struct list_head        pending;
+        unsigned                match_existing_only:1;
 };
 
 
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index 0b3da40a525e..d315c8907869 100644
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -142,10 +142,11 @@ enum musb_vbus_id_status {
 };
 
 #if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
-void musb_mailbox(enum musb_vbus_id_status status);
+int musb_mailbox(enum musb_vbus_id_status status);
 #else
-static inline void musb_mailbox(enum musb_vbus_id_status status)
+static inline int musb_mailbox(enum musb_vbus_id_status status)
 {
+        return 0;
 }
 #endif
 
diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h
index 98a938aabdfb..7a8d6037a4bb 100644
--- a/include/media/v4l2-mc.h
+++ b/include/media/v4l2-mc.h
@@ -1,7 +1,7 @@
 /*
  * v4l2-mc.h - Media Controller V4L2 types and prototypes
  *
- * Copyright (C) 2016 Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+ * Copyright (C) 2016 Mauro Carvalho Chehab <mchehab@kernel.org>
  * Copyright (C) 2006-2010 Nokia Corporation
  * Copyright (c) 2016 Intel Corporation.
  *
diff --git a/kernel/kcov.c b/kernel/kcov.c
index a02f2dddd1d7..8d44b3fea9d0 100644
--- a/kernel/kcov.c
+++ b/kernel/kcov.c
@@ -264,7 +264,12 @@ static const struct file_operations kcov_fops = {
 
 static int __init kcov_init(void)
 {
-        if (!debugfs_create_file("kcov", 0600, NULL, NULL, &kcov_fops)) {
+        /*
+         * The kcov debugfs file won't ever get removed and thus,
+         * there is no need to protect it against removal races. The
+         * use of debugfs_create_file_unsafe() is actually safe here.
+         */
+        if (!debugfs_create_file_unsafe("kcov", 0600, NULL, NULL, &kcov_fops)) {
                 pr_err("failed to create kcov in debugfs\n");
                 return -ENOMEM;
         }
diff --git a/mm/percpu.c b/mm/percpu.c
index 0c59684f1ff2..9903830aaebb 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -112,7 +112,7 @@ struct pcpu_chunk {
         int                     map_used;       /* # of map entries used before the sentry */
         int                     map_alloc;      /* # of map entries allocated */
         int                     *map;           /* allocation map */
-        struct work_struct      map_extend_work;/* async ->map[] extension */
+        struct list_head        map_extend_list;/* on pcpu_map_extend_chunks */
 
         void                    *data;          /* chunk data */
         int                     first_free;     /* no free below this */
@@ -162,10 +162,13 @@ static struct pcpu_chunk *pcpu_reserved_chunk;
 static int pcpu_reserved_chunk_limit;
 
 static DEFINE_SPINLOCK(pcpu_lock);      /* all internal data structures */
-static DEFINE_MUTEX(pcpu_alloc_mutex);  /* chunk create/destroy, [de]pop */
+static DEFINE_MUTEX(pcpu_alloc_mutex);  /* chunk create/destroy, [de]pop, map ext */
 
 static struct list_head *pcpu_slot __read_mostly; /* chunk list slots */
 
+/* chunks which need their map areas extended, protected by pcpu_lock */
+static LIST_HEAD(pcpu_map_extend_chunks);
+
 /*
  * The number of empty populated pages, protected by pcpu_lock.  The
  * reserved chunk doesn't contribute to the count.
@@ -395,13 +398,19 @@ static int pcpu_need_to_extend(struct pcpu_chunk *chunk, bool is_atomic)
 {
         int margin, new_alloc;
 
+        lockdep_assert_held(&pcpu_lock);
+
         if (is_atomic) {
                 margin = 3;
 
                 if (chunk->map_alloc <
-                    chunk->map_used + PCPU_ATOMIC_MAP_MARGIN_LOW &&
-                    pcpu_async_enabled)
-                        schedule_work(&chunk->map_extend_work);
+                    chunk->map_used + PCPU_ATOMIC_MAP_MARGIN_LOW) {
+                        if (list_empty(&chunk->map_extend_list)) {
+                                list_add_tail(&chunk->map_extend_list,
+                                              &pcpu_map_extend_chunks);
+                                pcpu_schedule_balance_work();
+                        }
+                }
         } else {
                 margin = PCPU_ATOMIC_MAP_MARGIN_HIGH;
         }
@@ -435,6 +444,8 @@ static int pcpu_extend_area_map(struct pcpu_chunk *chunk, int new_alloc)
         size_t old_size = 0, new_size = new_alloc * sizeof(new[0]);
         unsigned long flags;
 
+        lockdep_assert_held(&pcpu_alloc_mutex);
+
         new = pcpu_mem_zalloc(new_size);
         if (!new)
                 return -ENOMEM;
@@ -467,20 +478,6 @@ out_unlock:
         return 0;
 }
 
-static void pcpu_map_extend_workfn(struct work_struct *work)
-{
-        struct pcpu_chunk *chunk = container_of(work, struct pcpu_chunk,
-                                                map_extend_work);
-        int new_alloc;
-
-        spin_lock_irq(&pcpu_lock);
-        new_alloc = pcpu_need_to_extend(chunk, false);
-        spin_unlock_irq(&pcpu_lock);
-
-        if (new_alloc)
-                pcpu_extend_area_map(chunk, new_alloc);
-}
-
 /**
  * pcpu_fit_in_area - try to fit the requested allocation in a candidate area
  * @chunk: chunk the candidate area belongs to
@@ -740,7 +737,7 @@ static struct pcpu_chunk *pcpu_alloc_chunk(void)
         chunk->map_used = 1;
 
         INIT_LIST_HEAD(&chunk->list);
-        INIT_WORK(&chunk->map_extend_work, pcpu_map_extend_workfn);
+        INIT_LIST_HEAD(&chunk->map_extend_list);
         chunk->free_size = pcpu_unit_size;
         chunk->contig_hint = pcpu_unit_size;
 
@@ -895,6 +892,9 @@ static void __percpu *pcpu_alloc(size_t size, size_t align, bool reserved,
                 return NULL;
         }
 
+        if (!is_atomic)
+                mutex_lock(&pcpu_alloc_mutex);
+
         spin_lock_irqsave(&pcpu_lock, flags);
 
         /* serve reserved allocations from the reserved chunk if available */
@@ -967,12 +967,9 @@ restart:
         if (is_atomic)
                 goto fail;
 
-        mutex_lock(&pcpu_alloc_mutex);
-
         if (list_empty(&pcpu_slot[pcpu_nr_slots - 1])) {
                 chunk = pcpu_create_chunk();
                 if (!chunk) {
-                        mutex_unlock(&pcpu_alloc_mutex);
                         err = "failed to allocate new chunk";
                         goto fail;
                 }
@@ -983,7 +980,6 @@ restart:
                 spin_lock_irqsave(&pcpu_lock, flags);
         }
 
-        mutex_unlock(&pcpu_alloc_mutex);
         goto restart;
 
 area_found:
@@ -993,8 +989,6 @@ area_found:
         if (!is_atomic) {
                 int page_start, page_end, rs, re;
 
-                mutex_lock(&pcpu_alloc_mutex);
-
                 page_start = PFN_DOWN(off);
                 page_end = PFN_UP(off + size);
 
@@ -1005,7 +999,6 @@ area_found:
 
                         spin_lock_irqsave(&pcpu_lock, flags);
                         if (ret) {
-                                mutex_unlock(&pcpu_alloc_mutex);
                                 pcpu_free_area(chunk, off, &occ_pages);
                                 err = "failed to populate";
                                 goto fail_unlock;
@@ -1045,6 +1038,8 @@ fail:
                 /* see the flag handling in pcpu_blance_workfn() */
                 pcpu_atomic_alloc_failed = true;
                 pcpu_schedule_balance_work();
+        } else {
+                mutex_unlock(&pcpu_alloc_mutex);
         }
         return NULL;
 }
@@ -1129,6 +1124,7 @@ static void pcpu_balance_workfn(struct work_struct *work)
                 if (chunk == list_first_entry(free_head, struct pcpu_chunk, list))
                         continue;
 
+                list_del_init(&chunk->map_extend_list);
                 list_move(&chunk->list, &to_free);
         }
 
@@ -1146,6 +1142,25 @@ static void pcpu_balance_workfn(struct work_struct *work)
                 pcpu_destroy_chunk(chunk);
         }
 
+        /* service chunks which requested async area map extension */
+        do {
+                int new_alloc = 0;
+
+                spin_lock_irq(&pcpu_lock);
+
+                chunk = list_first_entry_or_null(&pcpu_map_extend_chunks,
+                                        struct pcpu_chunk, map_extend_list);
+                if (chunk) {
+                        list_del_init(&chunk->map_extend_list);
+                        new_alloc = pcpu_need_to_extend(chunk, false);
+                }
+
+                spin_unlock_irq(&pcpu_lock);
+
+                if (new_alloc)
+                        pcpu_extend_area_map(chunk, new_alloc);
+        } while (chunk);
+
         /*
          * Ensure there are certain number of free populated pages for
          * atomic allocs.  Fill up from the most packed so that atomic
@@ -1644,7 +1659,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
          */
         schunk = memblock_virt_alloc(pcpu_chunk_struct_size, 0);
         INIT_LIST_HEAD(&schunk->list);
-        INIT_WORK(&schunk->map_extend_work, pcpu_map_extend_workfn);
+        INIT_LIST_HEAD(&schunk->map_extend_list);
         schunk->base_addr = base_addr;
         schunk->map = smap;
         schunk->map_alloc = ARRAY_SIZE(smap);
@@ -1673,7 +1688,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
         if (dyn_size) {
                 dchunk = memblock_virt_alloc(pcpu_chunk_struct_size, 0);
                 INIT_LIST_HEAD(&dchunk->list);
-                INIT_WORK(&dchunk->map_extend_work, pcpu_map_extend_workfn);
+                INIT_LIST_HEAD(&dchunk->map_extend_list);
                 dchunk->base_addr = base_addr;
                 dchunk->map = dmap;
                 dchunk->map_alloc = ARRAY_SIZE(dmap);
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 06b4df9faaa1..2808d550d273 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -446,16 +446,27 @@ out_no_rpciod:
         return ERR_PTR(err);
 }
 
-struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,
+static struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,
                                         struct rpc_xprt *xprt)
 {
         struct rpc_clnt *clnt = NULL;
         struct rpc_xprt_switch *xps;
 
-        xps = xprt_switch_alloc(xprt, GFP_KERNEL);
-        if (xps == NULL)
-                return ERR_PTR(-ENOMEM);
-
+        if (args->bc_xprt && args->bc_xprt->xpt_bc_xps) {
+                WARN_ON(args->protocol != XPRT_TRANSPORT_BC_TCP);
+                xps = args->bc_xprt->xpt_bc_xps;
+                xprt_switch_get(xps);
+        } else {
+                xps = xprt_switch_alloc(xprt, GFP_KERNEL);
+                if (xps == NULL) {
+                        xprt_put(xprt);
+                        return ERR_PTR(-ENOMEM);
+                }
+                if (xprt->bc_xprt) {
+                        xprt_switch_get(xps);
+                        xprt->bc_xprt->xpt_bc_xps = xps;
+                }
+        }
         clnt = rpc_new_client(args, xps, xprt, NULL);
         if (IS_ERR(clnt))
                 return clnt;
@@ -483,7 +494,6 @@ struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,
 
         return clnt;
 }
-EXPORT_SYMBOL_GPL(rpc_create_xprt);
 
 /**
  * rpc_create - create an RPC client and transport with one call
@@ -509,6 +519,15 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
         };
         char servername[48];
 
+        if (args->bc_xprt) {
+                WARN_ON(args->protocol != XPRT_TRANSPORT_BC_TCP);
+                xprt = args->bc_xprt->xpt_bc_xprt;
+                if (xprt) {
+                        xprt_get(xprt);
+                        return rpc_create_xprt(args, xprt);
+                }
+        }
+
         if (args->flags & RPC_CLNT_CREATE_INFINITE_SLOTS)
                 xprtargs.flags |= XPRT_CREATE_INFINITE_SLOTS;
         if (args->flags & RPC_CLNT_CREATE_NO_IDLE_TIMEOUT)
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index f5572e31d518..4f01f63102ee 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -136,6 +136,8 @@ static void svc_xprt_free(struct kref *kref)
         /* See comment on corresponding get in xs_setup_bc_tcp(): */
         if (xprt->xpt_bc_xprt)
                 xprt_put(xprt->xpt_bc_xprt);
+        if (xprt->xpt_bc_xps)
+                xprt_switch_put(xprt->xpt_bc_xps);
         xprt->xpt_ops->xpo_free(xprt);
         module_put(owner);
 }
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 2d3e0c42361e..7e2b2fa189c3 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -3057,6 +3057,7 @@ static struct rpc_xprt *xs_setup_bc_tcp(struct xprt_create *args)
                 return xprt;
 
         args->bc_xprt->xpt_bc_xprt = NULL;
+        args->bc_xprt->xpt_bc_xps = NULL;
         xprt_put(xprt);
         ret = ERR_PTR(-EINVAL);
 out_err:
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 80aa6a3e6817..735362c26c8e 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -315,7 +315,7 @@ static struct sock *unix_find_socket_byinode(struct inode *i)
                     &unix_socket_table[i->i_ino & (UNIX_HASH_SIZE - 1)]) {
                 struct dentry *dentry = unix_sk(s)->path.dentry;
 
-                if (dentry && d_backing_inode(dentry) == i) {
+                if (dentry && d_real_inode(dentry) == i) {
                         sock_hold(s);
                         goto found;
                 }
@@ -911,7 +911,7 @@ static struct sock *unix_find_other(struct net *net,
                 err = kern_path(sunname->sun_path, LOOKUP_FOLLOW, &path);
                 if (err)
                         goto fail;
-                inode = d_backing_inode(path.dentry);
+                inode = d_real_inode(path.dentry);
                 err = inode_permission(inode, MAY_WRITE);
                 if (err)
                         goto put_fail;
@@ -1048,7 +1048,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
                         goto out_up;
                 }
                 addr->hash = UNIX_HASH_SIZE;
-                hash = d_backing_inode(dentry)->i_ino & (UNIX_HASH_SIZE - 1);
+                hash = d_real_inode(dentry)->i_ino & (UNIX_HASH_SIZE - 1);
                 spin_lock(&unix_table_lock);
                 u->path = u_path;
                 list = &unix_socket_table[hash];
diff --git a/security/keys/key.c b/security/keys/key.c
index bd5a272f28a6..346fbf201c22 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -597,7 +597,7 @@ int key_reject_and_link(struct key *key,
 
         mutex_unlock(&key_construction_mutex);
 
-        if (keyring)
+        if (keyring && link_ret == 0)
                 __key_link_end(keyring, &key->index_key, edit);
 
         /* wake up anyone waiting for a key to be constructed */
diff --git a/tools/virtio/ringtest/Makefile b/tools/virtio/ringtest/Makefile
index 6ba745529833..6173adae9f08 100644
--- a/tools/virtio/ringtest/Makefile
+++ b/tools/virtio/ringtest/Makefile
@@ -1,6 +1,6 @@
 all:
 
-all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder
+all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder noring
 
 CFLAGS += -Wall
 CFLAGS += -pthread -O2 -ggdb
@@ -15,11 +15,13 @@ ring: ring.o main.o
 virtio_ring_0_9: virtio_ring_0_9.o main.o
 virtio_ring_poll: virtio_ring_poll.o main.o
 virtio_ring_inorder: virtio_ring_inorder.o main.o
+noring: noring.o main.o
 clean:
         -rm main.o
         -rm ring.o ring
         -rm virtio_ring_0_9.o virtio_ring_0_9
         -rm virtio_ring_poll.o virtio_ring_poll
         -rm virtio_ring_inorder.o virtio_ring_inorder
+        -rm noring.o noring
 
 .PHONY: all clean
diff --git a/tools/virtio/ringtest/README b/tools/virtio/ringtest/README
index 34e94c46104f..d83707a336c9 100644
--- a/tools/virtio/ringtest/README
+++ b/tools/virtio/ringtest/README
@@ -1,2 +1,6 @@
 Partial implementation of various ring layouts, useful to tune virtio design.
 Uses shared memory heavily.
+
+Typical use:
+
+# sh run-on-all.sh perf stat -r 10 --log-fd 1 -- ./ring
diff --git a/tools/virtio/ringtest/noring.c b/tools/virtio/ringtest/noring.c
new file mode 100644
index 000000000000..eda2f4824130
--- /dev/null
+++ b/tools/virtio/ringtest/noring.c
@@ -0,0 +1,69 @@
+#define _GNU_SOURCE
+#include "main.h"
+#include <assert.h>
+
+/* stub implementation: useful for measuring overhead */
+void alloc_ring(void)
+{
+}
+
+/* guest side */
+int add_inbuf(unsigned len, void *buf, void *datap)
+{
+        return 0;
+}
+
+/*
+ * skb_array API provides no way for producer to find out whether a given
+ * buffer was consumed.  Our tests merely require that a successful get_buf
+ * implies that add_inbuf succeed in the past, and that add_inbuf will succeed,
+ * fake it accordingly.
+ */
+void *get_buf(unsigned *lenp, void **bufp)
+{
+        return "Buffer";
+}
+
+void poll_used(void)
+{
+}
+
+void disable_call()
+{
+        assert(0);
+}
+
+bool enable_call()
+{
+        assert(0);
+}
+
+void kick_available(void)
+{
+        assert(0);
+}
+
+/* host side */
+void disable_kick()
+{
+        assert(0);
+}
+
+bool enable_kick()
+{
+        assert(0);
+}
+
+void poll_avail(void)
+{
+}
+
+bool use_buf(unsigned *lenp, void **bufp)
+{
+        return true;
+}
+
+void call_used(void)
+{
+        assert(0);
+}
diff --git a/tools/virtio/ringtest/run-on-all.sh b/tools/virtio/ringtest/run-on-all.sh
index 52b0f71ffa8d..2e69ca812b4c 100755
--- a/tools/virtio/ringtest/run-on-all.sh
+++ b/tools/virtio/ringtest/run-on-all.sh
@@ -3,10 +3,10 @@
 #use last CPU for host. Why not the first?
 #many devices tend to use cpu0 by default so
 #it tends to be busier
-HOST_AFFINITY=$(cd /dev/cpu; ls|grep -v '[a-z]'|sort -n|tail -1)
+HOST_AFFINITY=$(lscpu -p=cpu | tail -1)
 
 #run command on all cpus
-for cpu in $(cd /dev/cpu; ls|grep -v '[a-z]'|sort -n);
+for cpu in $(seq 0 $HOST_AFFINITY)
 do
         #Don't run guest and host on same CPU
         #It actually works ok if using signalling
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 02e98f3131bd..48bd520fc702 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2941,7 +2941,7 @@ static long kvm_vm_ioctl(struct file *filp,
                 if (copy_from_user(&routing, argp, sizeof(routing)))
                         goto out;
                 r = -EINVAL;
-                if (routing.nr >= KVM_MAX_IRQ_ROUTES)
+                if (routing.nr > KVM_MAX_IRQ_ROUTES)
                         goto out;
                 if (routing.flags)
                         goto out;