Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

239 files changed, 2415 insertions, 1377 deletions

diff --git a/Documentation/ABI/stable/sysfs-bus-xen-backend b/Documentation/ABI/stable/sysfs-bus-xen-backend
index 3d5951c8bf5f..e8b60bd766f7 100644
--- a/Documentation/ABI/stable/sysfs-bus-xen-backend
+++ b/Documentation/ABI/stable/sysfs-bus-xen-backend
@@ -73,3 +73,12 @@ KernelVersion:	3.0
 Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 Description:
                 Number of sectors written by the frontend.
+
+What:           /sys/bus/xen-backend/devices/*/state
+Date:           August 2018
+KernelVersion:  4.19
+Contact:        Joe Jin <joe.jin@oracle.com>
+Description:
+                The state of the device. One of: 'Unknown',
+                'Initialising', 'Initialised', 'Connected', 'Closing',
+                'Closed', 'Reconfiguring', 'Reconfigured'.
diff --git a/Documentation/ABI/testing/sysfs-driver-xen-blkback b/Documentation/ABI/testing/sysfs-driver-xen-blkback
index 8bb43b66eb55..4e7babb3ba1f 100644
--- a/Documentation/ABI/testing/sysfs-driver-xen-blkback
+++ b/Documentation/ABI/testing/sysfs-driver-xen-blkback
@@ -15,3 +15,13 @@ Description:
                 blkback. If the frontend tries to use more than
                 max_persistent_grants, the LRU kicks in and starts
                 removing 5% of max_persistent_grants every 100ms.
+
+What:           /sys/module/xen_blkback/parameters/persistent_grant_unused_seconds
+Date:           August 2018
+KernelVersion:  4.19
+Contact:        Roger Pau Monné <roger.pau@citrix.com>
+Description:
+                How long a persistent grant is allowed to remain
+                allocated without being in use. The time is in
+                seconds, 0 means indefinitely long.
+                The default is 60 seconds.
diff --git a/Documentation/arm64/sve.txt b/Documentation/arm64/sve.txt
index f128f736b4a5..7169a0ec41d8 100644
--- a/Documentation/arm64/sve.txt
+++ b/Documentation/arm64/sve.txt
@@ -200,7 +200,7 @@ prctl(PR_SVE_SET_VL, unsigned long arg)
       thread.
 
     * Changing the vector length causes all of P0..P15, FFR and all bits of
-      Z0..V31 except for Z0 bits [127:0] .. Z31 bits [127:0] to become
+      Z0..Z31 except for Z0 bits [127:0] .. Z31 bits [127:0] to become
       unspecified.  Calling PR_SVE_SET_VL with vl equal to the thread's current
       vector length, or calling PR_SVE_SET_VL with the PR_SVE_SET_VL_ONEXEC
       flag, does not constitute a change to the vector length for this purpose.
@@ -500,7 +500,7 @@ References
 [2] arch/arm64/include/uapi/asm/ptrace.h
     AArch64 Linux ptrace ABI definitions
 
-[3] linux/Documentation/arm64/cpu-feature-registers.txt
+[3] Documentation/arm64/cpu-feature-registers.txt
 
 [4] ARM IHI0055C
     http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055c/IHI0055C_beta_aapcs64.pdf
diff --git a/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.txt
index b0a8af51c388..265b223cd978 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.txt
@@ -11,7 +11,7 @@ The RISC-V supervisor ISA manual specifies three interrupt sources that are
 attached to every HLIC: software interrupts, the timer interrupt, and external
 interrupts.  Software interrupts are used to send IPIs between cores.  The
 timer interrupt comes from an architecturally mandated real-time timer that is
-controller via Supervisor Binary Interface (SBI) calls and CSR reads.  External
+controlled via Supervisor Binary Interface (SBI) calls and CSR reads.  External
 interrupts connect all other device interrupts to the HLIC, which are routed
 via the platform-level interrupt controller (PLIC).
 
@@ -25,7 +25,15 @@ in the system.
 
 Required properties:
 - compatible : "riscv,cpu-intc"
-- #interrupt-cells : should be <1>
+- #interrupt-cells : should be <1>.  The interrupt sources are defined by the
+  RISC-V supervisor ISA manual, with only the following three interrupts being
+  defined for supervisor mode:
+    - Source 1 is the supervisor software interrupt, which can be sent by an SBI
+      call and is reserved for use by software.
+    - Source 5 is the supervisor timer interrupt, which can be configured by
+      SBI calls and implements a one-shot timer.
+    - Source 9 is the supervisor external interrupt, which chains to all other
+      device interrupts.
 - interrupt-controller : Identifies the node as an interrupt controller
 
 Furthermore, this interrupt-controller MUST be embedded inside the cpu
@@ -38,7 +46,7 @@ An example device tree entry for a HLIC is show below.
                 ...
                 cpu1-intc: interrupt-controller {
                         #interrupt-cells = <1>;
-                        compatible = "riscv,cpu-intc", "sifive,fu540-c000-cpu-intc";
+                        compatible = "sifive,fu540-c000-cpu-intc", "riscv,cpu-intc";
                         interrupt-controller;
                 };
         };
diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt
index 41089369f891..b3acebe08eb0 100644
--- a/Documentation/devicetree/bindings/net/cpsw.txt
+++ b/Documentation/devicetree/bindings/net/cpsw.txt
@@ -19,6 +19,10 @@ Required properties:
 - slaves                : Specifies number for slaves
 - active_slave          : Specifies the slave to use for time stamping,
                           ethtool and SIOCGMIIPHY
+- cpsw-phy-sel          : Specifies the phandle to the CPSW phy mode selection
+                          device. See also cpsw-phy-sel.txt for it's binding.
+                          Note that in legacy cases cpsw-phy-sel may be
+                          a child device instead of a phandle.
 
 Optional properties:
 - ti,hwmods             : Must be "cpgmac0"
@@ -75,6 +79,7 @@ Examples:
                 cpts_clock_mult = <0x80000000>;
                 cpts_clock_shift = <29>;
                 syscon = <&cm>;
+                cpsw-phy-sel = <&phy_sel>;
                 cpsw_emac0: slave@0 {
                         phy_id = <&davinci_mdio>, <0>;
                         phy-mode = "rgmii-txid";
@@ -103,6 +108,7 @@ Examples:
                 cpts_clock_mult = <0x80000000>;
                 cpts_clock_shift = <29>;
                 syscon = <&cm>;
+                cpsw-phy-sel = <&phy_sel>;
                 cpsw_emac0: slave@0 {
                         phy_id = <&davinci_mdio>, <0>;
                         phy-mode = "rgmii-txid";
diff --git a/Documentation/devicetree/bindings/net/sh_eth.txt b/Documentation/devicetree/bindings/net/sh_eth.txt
index 76db9f13ad96..abc36274227c 100644
--- a/Documentation/devicetree/bindings/net/sh_eth.txt
+++ b/Documentation/devicetree/bindings/net/sh_eth.txt
@@ -16,6 +16,7 @@ Required properties:
               "renesas,ether-r8a7794"  if the device is a part of R8A7794 SoC.
               "renesas,gether-r8a77980" if the device is a part of R8A77980 SoC.
               "renesas,ether-r7s72100" if the device is a part of R7S72100 SoC.
+              "renesas,ether-r7s9210" if the device is a part of R7S9210 SoC.
               "renesas,rcar-gen1-ether" for a generic R-Car Gen1 device.
               "renesas,rcar-gen2-ether" for a generic R-Car Gen2 or RZ/G1
                                         device.
diff --git a/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt b/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
index 5d47a262474c..9407212a85a8 100644
--- a/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
@@ -7,6 +7,7 @@ Required properties:
                Examples with soctypes are:
                  - "renesas,r8a7743-wdt" (RZ/G1M)
                  - "renesas,r8a7745-wdt" (RZ/G1E)
+                 - "renesas,r8a774a1-wdt" (RZ/G2M)
                  - "renesas,r8a7790-wdt" (R-Car H2)
                  - "renesas,r8a7791-wdt" (R-Car M2-W)
                  - "renesas,r8a7792-wdt" (R-Car V2H)
@@ -21,8 +22,8 @@ Required properties:
                  - "renesas,r7s72100-wdt" (RZ/A1)
                 The generic compatible string must be:
                  - "renesas,rza-wdt" for RZ/A
-                 - "renesas,rcar-gen2-wdt" for R-Car Gen2 and RZ/G
-                 - "renesas,rcar-gen3-wdt" for R-Car Gen3
+                 - "renesas,rcar-gen2-wdt" for R-Car Gen2 and RZ/G1
+                 - "renesas,rcar-gen3-wdt" for R-Car Gen3 and RZ/G2
 
 - reg : Should contain WDT registers location and length
 - clocks : the clock feeding the watchdog timer.
diff --git a/Documentation/hwmon/ina2xx b/Documentation/hwmon/ina2xx
index 72d16f08e431..b8df81f6d6bc 100644
--- a/Documentation/hwmon/ina2xx
+++ b/Documentation/hwmon/ina2xx
@@ -32,7 +32,7 @@ Supported chips:
     Datasheet: Publicly available at the Texas Instruments website
                http://www.ti.com/
 
-Author: Lothar Felten <l-felten@ti.com>
+Author: Lothar Felten <lothar.felten@gmail.com>
 
 Description
 -----------
diff --git a/Documentation/i2c/DMA-considerations b/Documentation/i2c/DMA-considerations
index 966610aa4620..203002054120 100644
--- a/Documentation/i2c/DMA-considerations
+++ b/Documentation/i2c/DMA-considerations
@@ -50,10 +50,14 @@ bounce buffer. But you don't need to care about that detail, just use the
 returned buffer. If NULL is returned, the threshold was not met or a bounce
 buffer could not be allocated. Fall back to PIO in that case.
 
-In any case, a buffer obtained from above needs to be released. It ensures data
-is copied back to the message and a potentially used bounce buffer is freed::
+In any case, a buffer obtained from above needs to be released. Another helper
+function ensures a potentially used bounce buffer is freed::
 
-        i2c_release_dma_safe_msg_buf(msg, dma_buf);
+        i2c_put_dma_safe_msg_buf(dma_buf, msg, xferred);
+
+The last argument 'xferred' controls if the buffer is synced back to the
+message or not. No syncing is needed in cases setting up DMA had an error and
+there was no data transferred.
 
 The bounce buffer handling from the core is generic and simple. It will always
 allocate a new bounce buffer. If you want a more sophisticated handling (e.g.
diff --git a/Makefile b/Makefile
index 2b458801ba74..19948e556941 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 4
 PATCHLEVEL = 19
 SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
 NAME = Merciless Moray
 
 # *DOCUMENTATION*
@@ -807,6 +807,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
 # disable pointer signed / unsigned warnings in gcc 4.0
 KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign)
 
+# disable stringop warnings in gcc 8+
+KBUILD_CFLAGS += $(call cc-disable-warning, stringop-truncation)
+
 # disable invalid "can't wrap" optimizations for signed / pointers
 KBUILD_CFLAGS   += $(call cc-option,-fno-strict-overflow)
 
diff --git a/arch/arm/boot/dts/am335x-osd3358-sm-red.dts b/arch/arm/boot/dts/am335x-osd3358-sm-red.dts
index 4d969013f99a..4d969013f99a 100755..100644
--- a/arch/arm/boot/dts/am335x-osd3358-sm-red.dts
+++ b/arch/arm/boot/dts/am335x-osd3358-sm-red.dts
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index f0cbd86312dc..d4b7c59eec68 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -469,6 +469,7 @@
                         ti,hwmods = "rtc";
                         clocks = <&clk_32768_ck>;
                         clock-names = "int-clk";
+                        system-power-controller;
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts
index 9fb47724b9c1..ad2ae25b7b4d 100644
--- a/arch/arm/boot/dts/imx23-evk.dts
+++ b/arch/arm/boot/dts/imx23-evk.dts
@@ -13,6 +13,43 @@
                 reg = <0x40000000 0x08000000>;
         };
 
+        reg_vddio_sd0: regulator-vddio-sd0 {
+                compatible = "regulator-fixed";
+                regulator-name = "vddio-sd0";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&gpio1 29 0>;
+        };
+
+        reg_lcd_3v3: regulator-lcd-3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "lcd-3v3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&gpio1 18 0>;
+                enable-active-high;
+        };
+
+        reg_lcd_5v: regulator-lcd-5v {
+                compatible = "regulator-fixed";
+                regulator-name = "lcd-5v";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+        };
+
+        panel {
+                compatible = "sii,43wvf1g";
+                backlight = <&backlight_display>;
+                dvdd-supply = <&reg_lcd_3v3>;
+                avdd-supply = <&reg_lcd_5v>;
+
+                port {
+                        panel_in: endpoint {
+                                remote-endpoint = <&display_out>;
+                        };
+                };
+        };
+
         apb@80000000 {
                 apbh@80000000 {
                         gpmi-nand@8000c000 {
@@ -52,31 +89,11 @@
                         lcdif@80030000 {
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&lcdif_24bit_pins_a>;
-                                lcd-supply = <&reg_lcd_3v3>;
-                                display = <&display0>;
                                 status = "okay";
 
-                                display0: display0 {
-                                        bits-per-pixel = <32>;
-                                        bus-width = <24>;
-
-                                        display-timings {
-                                                native-mode = <&timing0>;
-                                                timing0: timing0 {
-                                                        clock-frequency = <9200000>;
-                                                        hactive = <480>;
-                                                        vactive = <272>;
-                                                        hback-porch = <15>;
-                                                        hfront-porch = <8>;
-                                                        vback-porch = <12>;
-                                                        vfront-porch = <4>;
-                                                        hsync-len = <1>;
-                                                        vsync-len = <1>;
-                                                        hsync-active = <0>;
-                                                        vsync-active = <0>;
-                                                        de-active = <1>;
-                                                        pixelclk-active = <0>;
-                                                };
+                                port {
+                                        display_out: endpoint {
+                                                remote-endpoint = <&panel_in>;
                                         };
                                 };
                         };
@@ -118,32 +135,7 @@
                 };
         };
 
-        regulators {
-                compatible = "simple-bus";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                reg_vddio_sd0: regulator@0 {
-                        compatible = "regulator-fixed";
-                        reg = <0>;
-                        regulator-name = "vddio-sd0";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        gpio = <&gpio1 29 0>;
-                };
-
-                reg_lcd_3v3: regulator@1 {
-                        compatible = "regulator-fixed";
-                        reg = <1>;
-                        regulator-name = "lcd-3v3";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        gpio = <&gpio1 18 0>;
-                        enable-active-high;
-                };
-        };
-
-        backlight {
+        backlight_display: backlight {
                 compatible = "pwm-backlight";
                 pwms = <&pwm 2 5000000>;
                 brightness-levels = <0 4 8 16 32 64 128 255>;
diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index 6b0ae667640f..93ab5bdfe068 100644
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -13,6 +13,87 @@
                 reg = <0x40000000 0x08000000>;
         };
 
+
+        reg_3p3v: regulator-3p3v {
+                compatible = "regulator-fixed";
+                regulator-name = "3P3V";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-always-on;
+        };
+
+        reg_vddio_sd0: regulator-vddio-sd0 {
+                compatible = "regulator-fixed";
+                regulator-name = "vddio-sd0";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&gpio3 28 0>;
+        };
+
+        reg_fec_3v3: regulator-fec-3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "fec-3v3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&gpio2 15 0>;
+        };
+
+        reg_usb0_vbus: regulator-usb0-vbus {
+                compatible = "regulator-fixed";
+                regulator-name = "usb0_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&gpio3 9 0>;
+                enable-active-high;
+        };
+
+        reg_usb1_vbus: regulator-usb1-vbus {
+                compatible = "regulator-fixed";
+                regulator-name = "usb1_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&gpio3 8 0>;
+                enable-active-high;
+        };
+
+        reg_lcd_3v3: regulator-lcd-3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "lcd-3v3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&gpio3 30 0>;
+                enable-active-high;
+        };
+
+        reg_can_3v3: regulator-can-3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "can-3v3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&gpio2 13 0>;
+                enable-active-high;
+        };
+
+        reg_lcd_5v: regulator-lcd-5v {
+                compatible = "regulator-fixed";
+                regulator-name = "lcd-5v";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+        };
+
+        panel {
+                compatible = "sii,43wvf1g";
+                backlight = <&backlight_display>;
+                dvdd-supply = <&reg_lcd_3v3>;
+                avdd-supply = <&reg_lcd_5v>;
+
+                port {
+                        panel_in: endpoint {
+                                remote-endpoint = <&display_out>;
+                        };
+                };
+        };
+
         apb@80000000 {
                 apbh@80000000 {
                         gpmi-nand@8000c000 {
@@ -116,31 +197,11 @@
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&lcdif_24bit_pins_a
                                              &lcdif_pins_evk>;
-                                lcd-supply = <&reg_lcd_3v3>;
-                                display = <&display0>;
                                 status = "okay";
 
-                                display0: display0 {
-                                        bits-per-pixel = <32>;
-                                        bus-width = <24>;
-
-                                        display-timings {
-                                                native-mode = <&timing0>;
-                                                timing0: timing0 {
-                                                        clock-frequency = <33500000>;
-                                                        hactive = <800>;
-                                                        vactive = <480>;
-                                                        hback-porch = <89>;
-                                                        hfront-porch = <164>;
-                                                        vback-porch = <23>;
-                                                        vfront-porch = <10>;
-                                                        hsync-len = <10>;
-                                                        vsync-len = <10>;
-                                                        hsync-active = <0>;
-                                                        vsync-active = <0>;
-                                                        de-active = <1>;
-                                                        pixelclk-active = <0>;
-                                                };
+                                port {
+                                        display_out: endpoint {
+                                                remote-endpoint = <&panel_in>;
                                         };
                                 };
                         };
@@ -269,80 +330,6 @@
                 };
         };
 
-        regulators {
-                compatible = "simple-bus";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                reg_3p3v: regulator@0 {
-                        compatible = "regulator-fixed";
-                        reg = <0>;
-                        regulator-name = "3P3V";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        regulator-always-on;
-                };
-
-                reg_vddio_sd0: regulator@1 {
-                        compatible = "regulator-fixed";
-                        reg = <1>;
-                        regulator-name = "vddio-sd0";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        gpio = <&gpio3 28 0>;
-                };
-
-                reg_fec_3v3: regulator@2 {
-                        compatible = "regulator-fixed";
-                        reg = <2>;
-                        regulator-name = "fec-3v3";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        gpio = <&gpio2 15 0>;
-                };
-
-                reg_usb0_vbus: regulator@3 {
-                        compatible = "regulator-fixed";
-                        reg = <3>;
-                        regulator-name = "usb0_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                        gpio = <&gpio3 9 0>;
-                        enable-active-high;
-                };
-
-                reg_usb1_vbus: regulator@4 {
-                        compatible = "regulator-fixed";
-                        reg = <4>;
-                        regulator-name = "usb1_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                        gpio = <&gpio3 8 0>;
-                        enable-active-high;
-                };
-
-                reg_lcd_3v3: regulator@5 {
-                        compatible = "regulator-fixed";
-                        reg = <5>;
-                        regulator-name = "lcd-3v3";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        gpio = <&gpio3 30 0>;
-                        enable-active-high;
-                };
-
-                reg_can_3v3: regulator@6 {
-                        compatible = "regulator-fixed";
-                        reg = <6>;
-                        regulator-name = "can-3v3";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        gpio = <&gpio2 13 0>;
-                        enable-active-high;
-                };
-
-        };
-
         sound {
                 compatible = "fsl,imx28-evk-sgtl5000",
                              "fsl,mxs-audio-sgtl5000";
@@ -363,7 +350,7 @@
                 };
         };
 
-        backlight {
+        backlight_display: backlight {
                 compatible = "pwm-backlight";
                 pwms = <&pwm 2 5000000>;
                 brightness-levels = <0 4 8 16 32 64 128 255>;
diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index 7cbc2ffa4b3a..7234e8330a57 100644
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -126,10 +126,14 @@
                 interrupt-names = "msi";
                 #interrupt-cells = <1>;
                 interrupt-map-mask = <0 0 0 0x7>;
-                interrupt-map = <0 0 0 1 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
-                                <0 0 0 2 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
-                                <0 0 0 3 &intc GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
-                                <0 0 0 4 &intc GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
+                /*
+                 * Reference manual lists pci irqs incorrectly
+                 * Real hardware ordering is same as imx6: D+MSI, C, B, A
+                 */
+                interrupt-map = <0 0 0 1 &intc GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+                                <0 0 0 2 &intc GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+                                <0 0 0 3 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                <0 0 0 4 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&clks IMX7D_PCIE_CTRL_ROOT_CLK>,
                          <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>,
                          <&clks IMX7D_PCIE_PHY_ROOT_CLK>;
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index 12d6822f0057..04758a2a87f0 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -354,7 +354,7 @@
 &mmc2 {
         vmmc-supply = <&vsdio>;
         bus-width = <8>;
-        non-removable;
+        ti,non-removable;
 };
 
 &mmc3 {
@@ -621,15 +621,6 @@
                 OMAP4_IOPAD(0x10c, PIN_INPUT | MUX_MODE1)       /* abe_mcbsp3_fsx */
                 >;
         };
-};
-
-&omap4_pmx_wkup {
-        usb_gpio_mux_sel2: pinmux_usb_gpio_mux_sel2_pins {
-                /* gpio_wk0 */
-                pinctrl-single,pins = <
-                OMAP4_IOPAD(0x040, PIN_OUTPUT_PULLDOWN | MUX_MODE3)
-                >;
-        };
 
         vibrator_direction_pin: pinmux_vibrator_direction_pin {
                 pinctrl-single,pins = <
@@ -644,6 +635,15 @@
         };
 };
 
+&omap4_pmx_wkup {
+        usb_gpio_mux_sel2: pinmux_usb_gpio_mux_sel2_pins {
+                /* gpio_wk0 */
+                pinctrl-single,pins = <
+                OMAP4_IOPAD(0x040, PIN_OUTPUT_PULLDOWN | MUX_MODE3)
+                >;
+        };
+};
+
 /*
  * As uart1 is wired to mdm6600 with rts and cts, we can use the cts pin for
  * uart1 wakeirq.
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index e2c127608bcc..7eca43ff69bb 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -257,6 +257,7 @@ CONFIG_IMX_IPUV3_CORE=y
 CONFIG_DRM=y
 CONFIG_DRM_PANEL_LVDS=y
 CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=y
 CONFIG_DRM_IMX=y
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index 148226e36152..7b8212857535 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -95,6 +95,7 @@ CONFIG_MFD_MXS_LRADC=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_DRM=y
+CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
 CONFIG_DRM_MXSFB=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig
index df68dc4056e5..5282324c7cef 100644
--- a/arch/arm/configs/versatile_defconfig
+++ b/arch/arm/configs/versatile_defconfig
@@ -5,19 +5,19 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_PARTITION_ADVANCED=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_VERSATILE=y
 CONFIG_AEABI=y
 CONFIG_OABI_COMPAT=y
-CONFIG_CMA=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="root=1f03 mem=32M"
 CONFIG_FPE_NWFPE=y
 CONFIG_VFP=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_CMA=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -59,6 +59,7 @@ CONFIG_GPIO_PL061=y
 CONFIG_DRM=y
 CONFIG_DRM_PANEL_ARM_VERSATILE=y
 CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_DRM_DUMB_VGA_DAC=y
 CONFIG_DRM_PL111=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
@@ -89,9 +90,10 @@ CONFIG_NFSD=y
 CONFIG_NFSD_V3=y
 CONFIG_NLS_CODEPAGE_850=m
 CONFIG_NLS_ISO8859_1=m
+CONFIG_FONTS=y
+CONFIG_FONT_ACORN_8x8=y
+CONFIG_DEBUG_FS=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
-CONFIG_FONTS=y
-CONFIG_FONT_ACORN_8x8=y
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 2ceffd85dd3d..cd65ea4e9c54 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2161,6 +2161,37 @@ static int of_dev_hwmod_lookup(struct device_node *np,
 }
 
 /**
+ * omap_hwmod_fix_mpu_rt_idx - fix up mpu_rt_idx register offsets
+ *
+ * @oh: struct omap_hwmod *
+ * @np: struct device_node *
+ *
+ * Fix up module register offsets for modules with mpu_rt_idx.
+ * Only needed for cpsw with interconnect target module defined
+ * in device tree while still using legacy hwmod platform data
+ * for rev, sysc and syss registers.
+ *
+ * Can be removed when all cpsw hwmod platform data has been
+ * dropped.
+ */
+static void omap_hwmod_fix_mpu_rt_idx(struct omap_hwmod *oh,
+                                      struct device_node *np,
+                                      struct resource *res)
+{
+        struct device_node *child = NULL;
+        int error;
+
+        child = of_get_next_child(np, child);
+        if (!child)
+                return;
+
+        error = of_address_to_resource(child, oh->mpu_rt_idx, res);
+        if (error)
+                pr_err("%s: error mapping mpu_rt_idx: %i\n",
+                       __func__, error);
+}
+
+/**
  * omap_hwmod_parse_module_range - map module IO range from device tree
  * @oh: struct omap_hwmod *
  * @np: struct device_node *
@@ -2220,7 +2251,13 @@ int omap_hwmod_parse_module_range(struct omap_hwmod *oh,
         size = be32_to_cpup(ranges);
 
         pr_debug("omap_hwmod: %s %s at 0x%llx size 0x%llx\n",
-                 oh->name, np->name, base, size);
+                 oh ? oh->name : "", np->name, base, size);
+
+        if (oh && oh->mpu_rt_idx) {
+                omap_hwmod_fix_mpu_rt_idx(oh, np, res);
+
+                return 0;
+        }
 
         res->start = base;
         res->end = base + size - 1;
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 29e75b47becd..1b1a0e95c751 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -763,7 +763,6 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK
 
 config HOLES_IN_ZONE
         def_bool y
-        depends on NUMA
 
 source kernel/Kconfig.hz
 
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index f67e8d5e93ad..db8d364f8476 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -38,6 +38,7 @@ CONFIG_ARCH_BCM_IPROC=y
 CONFIG_ARCH_BERLIN=y
 CONFIG_ARCH_BRCMSTB=y
 CONFIG_ARCH_EXYNOS=y
+CONFIG_ARCH_K3=y
 CONFIG_ARCH_LAYERSCAPE=y
 CONFIG_ARCH_LG1K=y
 CONFIG_ARCH_HISI=y
@@ -605,6 +606,8 @@ CONFIG_ARCH_TEGRA_132_SOC=y
 CONFIG_ARCH_TEGRA_210_SOC=y
 CONFIG_ARCH_TEGRA_186_SOC=y
 CONFIG_ARCH_TEGRA_194_SOC=y
+CONFIG_ARCH_K3_AM6_SOC=y
+CONFIG_SOC_TI=y
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_EXTCON_USBC_CROS_EC=y
diff --git a/arch/arm64/crypto/ghash-ce-glue.c b/arch/arm64/crypto/ghash-ce-glue.c
index 6e9f33d14930..067d8937d5af 100644
--- a/arch/arm64/crypto/ghash-ce-glue.c
+++ b/arch/arm64/crypto/ghash-ce-glue.c
@@ -417,7 +417,7 @@ static int gcm_encrypt(struct aead_request *req)
                 __aes_arm64_encrypt(ctx->aes_key.key_enc, tag, iv, nrounds);
                 put_unaligned_be32(2, iv + GCM_IV_SIZE);
 
-                while (walk.nbytes >= AES_BLOCK_SIZE) {
+                while (walk.nbytes >= (2 * AES_BLOCK_SIZE)) {
                         int blocks = walk.nbytes / AES_BLOCK_SIZE;
                         u8 *dst = walk.dst.virt.addr;
                         u8 *src = walk.src.virt.addr;
@@ -437,11 +437,18 @@ static int gcm_encrypt(struct aead_request *req)
                                         NULL);
 
                         err = skcipher_walk_done(&walk,
-                                                 walk.nbytes % AES_BLOCK_SIZE);
+                                                 walk.nbytes % (2 * AES_BLOCK_SIZE));
                 }
-                if (walk.nbytes)
+                if (walk.nbytes) {
                         __aes_arm64_encrypt(ctx->aes_key.key_enc, ks, iv,
                                             nrounds);
+                        if (walk.nbytes > AES_BLOCK_SIZE) {
+                                crypto_inc(iv, AES_BLOCK_SIZE);
+                                __aes_arm64_encrypt(ctx->aes_key.key_enc,
+                                                    ks + AES_BLOCK_SIZE, iv,
+                                                    nrounds);
+                        }
+                }
         }
 
         /* handle the tail */
@@ -545,7 +552,7 @@ static int gcm_decrypt(struct aead_request *req)
                 __aes_arm64_encrypt(ctx->aes_key.key_enc, tag, iv, nrounds);
                 put_unaligned_be32(2, iv + GCM_IV_SIZE);
 
-                while (walk.nbytes >= AES_BLOCK_SIZE) {
+                while (walk.nbytes >= (2 * AES_BLOCK_SIZE)) {
                         int blocks = walk.nbytes / AES_BLOCK_SIZE;
                         u8 *dst = walk.dst.virt.addr;
                         u8 *src = walk.src.virt.addr;
@@ -564,11 +571,21 @@ static int gcm_decrypt(struct aead_request *req)
                         } while (--blocks > 0);
 
                         err = skcipher_walk_done(&walk,
-                                                 walk.nbytes % AES_BLOCK_SIZE);
+                                                 walk.nbytes % (2 * AES_BLOCK_SIZE));
                 }
-                if (walk.nbytes)
+                if (walk.nbytes) {
+                        if (walk.nbytes > AES_BLOCK_SIZE) {
+                                u8 *iv2 = iv + AES_BLOCK_SIZE;
+
+                                memcpy(iv2, iv, AES_BLOCK_SIZE);
+                                crypto_inc(iv2, AES_BLOCK_SIZE);
+
+                                __aes_arm64_encrypt(ctx->aes_key.key_enc, iv2,
+                                                    iv2, nrounds);
+                        }
                         __aes_arm64_encrypt(ctx->aes_key.key_enc, iv, iv,
                                             nrounds);
+                }
         }
 
         /* handle the tail */
diff --git a/arch/arm64/crypto/sm4-ce-glue.c b/arch/arm64/crypto/sm4-ce-glue.c
index b7fb5274b250..0c4fc223f225 100644
--- a/arch/arm64/crypto/sm4-ce-glue.c
+++ b/arch/arm64/crypto/sm4-ce-glue.c
@@ -69,5 +69,5 @@ static void __exit sm4_ce_mod_fini(void)
         crypto_unregister_alg(&sm4_ce_alg);
 }
 
-module_cpu_feature_match(SM3, sm4_ce_mod_init);
+module_cpu_feature_match(SM4, sm4_ce_mod_init);
 module_exit(sm4_ce_mod_fini);
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c
index 3534aa6a4dc2..1b083c500b9a 100644
--- a/arch/m68k/mac/misc.c
+++ b/arch/m68k/mac/misc.c
@@ -98,11 +98,10 @@ static time64_t pmu_read_time(void)
 
         if (pmu_request(&req, NULL, 1, PMU_READ_RTC) < 0)
                 return 0;
-        while (!req.complete)
-                pmu_poll();
+        pmu_wait_complete(&req);
 
-        time = (u32)((req.reply[1] << 24) | (req.reply[2] << 16) |
-                     (req.reply[3] << 8) | req.reply[4]);
+        time = (u32)((req.reply[0] << 24) | (req.reply[1] << 16) |
+                     (req.reply[2] << 8) | req.reply[3]);
 
         return time - RTC_OFFSET;
 }
@@ -116,8 +115,7 @@ static void pmu_write_time(time64_t time)
                         (data >> 24) & 0xFF, (data >> 16) & 0xFF,
                         (data >> 8) & 0xFF, data & 0xFF) < 0)
                 return;
-        while (!req.complete)
-                pmu_poll();
+        pmu_wait_complete(&req);
 }
 
 static __u8 pmu_read_pram(int offset)
diff --git a/arch/nios2/Kconfig.debug b/arch/nios2/Kconfig.debug
index 7a49f0d28d14..f1da8a7b17ff 100644
--- a/arch/nios2/Kconfig.debug
+++ b/arch/nios2/Kconfig.debug
@@ -3,15 +3,6 @@
 config TRACE_IRQFLAGS_SUPPORT
         def_bool y
 
-config DEBUG_STACK_USAGE
-        bool "Enable stack utilization instrumentation"
-        depends on DEBUG_KERNEL
-        help
-          Enables the display of the minimum amount of free stack which each
-          task has ever had available in the sysrq-T and sysrq-P debug output.
-
-          This option will slow down process creation somewhat.
-
 config EARLY_PRINTK
         bool "Activate early kernel debugging"
         default y
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index db0b6eebbfa5..a80669209155 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -177,7 +177,6 @@ config PPC
         select HAVE_ARCH_KGDB
         select HAVE_ARCH_MMAP_RND_BITS
         select HAVE_ARCH_MMAP_RND_COMPAT_BITS   if COMPAT
-        select HAVE_ARCH_PREL32_RELOCATIONS
         select HAVE_ARCH_SECCOMP_FILTER
         select HAVE_ARCH_TRACEHOOK
         select HAVE_CBPF_JIT                    if !PPC64
diff --git a/arch/riscv/include/asm/tlb.h b/arch/riscv/include/asm/tlb.h
index c229509288ea..439dc7072e05 100644
--- a/arch/riscv/include/asm/tlb.h
+++ b/arch/riscv/include/asm/tlb.h
@@ -14,6 +14,10 @@
 #ifndef _ASM_RISCV_TLB_H
 #define _ASM_RISCV_TLB_H
 
+struct mmu_gather;
+
+static void tlb_flush(struct mmu_gather *tlb);
+
 #include <asm-generic/tlb.h>
 
 static inline void tlb_flush(struct mmu_gather *tlb)
diff --git a/arch/riscv/kernel/sys_riscv.c b/arch/riscv/kernel/sys_riscv.c
index 568026ccf6e8..fb03a4482ad6 100644
--- a/arch/riscv/kernel/sys_riscv.c
+++ b/arch/riscv/kernel/sys_riscv.c
@@ -65,24 +65,11 @@ SYSCALL_DEFINE6(mmap2, unsigned long, addr, unsigned long, len,
 SYSCALL_DEFINE3(riscv_flush_icache, uintptr_t, start, uintptr_t, end,
         uintptr_t, flags)
 {
-#ifdef CONFIG_SMP
-        struct mm_struct *mm = current->mm;
-        bool local = (flags & SYS_RISCV_FLUSH_ICACHE_LOCAL) != 0;
-#endif
-
         /* Check the reserved flags. */
         if (unlikely(flags & ~SYS_RISCV_FLUSH_ICACHE_ALL))
                 return -EINVAL;
 
-        /*
-         * Without CONFIG_SMP flush_icache_mm is a just a flush_icache_all(),
-         * which generates unused variable warnings all over this function.
-         */
-#ifdef CONFIG_SMP
-        flush_icache_mm(mm, local);
-#else
-        flush_icache_all();
-#endif
+        flush_icache_mm(current->mm, flags & SYS_RISCV_FLUSH_ICACHE_LOCAL);
 
         return 0;
 }
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index 3641a294ed54..e4abe9b8f97a 100644
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -9,6 +9,7 @@
 #include <linux/irq.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
+#include <linux/dma-mapping.h>
 #include <asm/leon.h>
 #include <asm/leon_amba.h>
 
@@ -381,6 +382,9 @@ static struct platform_device * __init scan_one_device(struct device_node *dp,
         else
                 dev_set_name(&op->dev, "%08x", dp->phandle);
 
+        op->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+        op->dev.dma_mask = &op->dev.coherent_dma_mask;
+
         if (of_device_register(op)) {
                 printk("%s: Could not register of device.\n",
                        dp->full_name);
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 44e4d4435bed..6df6086968c6 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -2,6 +2,7 @@
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/of.h>
+#include <linux/dma-mapping.h>
 #include <linux/init.h>
 #include <linux/export.h>
 #include <linux/mod_devicetable.h>
@@ -675,6 +676,8 @@ static struct platform_device * __init scan_one_device(struct device_node *dp,
                 dev_set_name(&op->dev, "root");
         else
                 dev_set_name(&op->dev, "%08x", dp->phandle);
+        op->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+        op->dev.dma_mask = &op->dev.coherent_dma_mask;
 
         if (of_device_register(op)) {
                 printk("%s: Could not register of device.\n",
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c5ff296bc5d1..1a0be022f91d 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2843,7 +2843,7 @@ config X86_SYSFB
           This option, if enabled, marks VGA/VBE/EFI framebuffers as generic
           framebuffers so the new generic system-framebuffer drivers can be
           used on x86. If the framebuffer is not compatible with the generic
-          modes, it is adverticed as fallback platform framebuffer so legacy
+          modes, it is advertised as fallback platform framebuffer so legacy
           drivers like efifb, vesafb and uvesafb can pick it up.
           If this option is not selected, all system framebuffers are always
           marked as fallback platform framebuffers as usual.
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 94859241bc3e..8f6e7eb8ae9f 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -175,22 +175,6 @@ ifdef CONFIG_FUNCTION_GRAPH_TRACER
   endif
 endif
 
-ifndef CC_HAVE_ASM_GOTO
-  $(error Compiler lacks asm-goto support.)
-endif
-
-#
-# Jump labels need '-maccumulate-outgoing-args' for gcc < 4.5.2 to prevent a
-# GCC bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=46226).  There's no way
-# to test for this bug at compile-time because the test case needs to execute,
-# which is a no-go for cross compilers.  So check the GCC version instead.
-#
-ifdef CONFIG_JUMP_LABEL
-  ifneq ($(ACCUMULATE_OUTGOING_ARGS), 1)
-        ACCUMULATE_OUTGOING_ARGS = $(call cc-if-fullversion, -lt, 040502, 1)
-  endif
-endif
-
 ifeq ($(ACCUMULATE_OUTGOING_ARGS), 1)
         # This compiler flag is not supported by Clang:
         KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args,)
@@ -312,6 +296,13 @@ PHONY += vdso_install
 vdso_install:
         $(Q)$(MAKE) $(build)=arch/x86/entry/vdso $@
 
+archprepare: checkbin
+checkbin:
+ifndef CC_HAVE_ASM_GOTO
+        @echo Compiler lacks asm-goto support.
+        @exit 1
+endif
+
 archclean:
         $(Q)rm -rf $(objtree)/arch/i386
         $(Q)rm -rf $(objtree)/arch/x86_64
diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
index 9bd139569b41..cb2deb61c5d9 100644
--- a/arch/x86/crypto/aesni-intel_asm.S
+++ b/arch/x86/crypto/aesni-intel_asm.S
@@ -223,34 +223,34 @@ ALL_F:      .octa 0xffffffffffffffffffffffffffffffff
         pcmpeqd TWOONE(%rip), \TMP2
         pand    POLY(%rip), \TMP2
         pxor    \TMP2, \TMP3
-        movdqa  \TMP3, HashKey(%arg2)
+        movdqu  \TMP3, HashKey(%arg2)
 
         movdqa     \TMP3, \TMP5
         pshufd     $78, \TMP3, \TMP1
         pxor       \TMP3, \TMP1
-        movdqa     \TMP1, HashKey_k(%arg2)
+        movdqu     \TMP1, HashKey_k(%arg2)
 
         GHASH_MUL  \TMP5, \TMP3, \TMP1, \TMP2, \TMP4, \TMP6, \TMP7
 # TMP5 = HashKey^2<<1 (mod poly)
-        movdqa     \TMP5, HashKey_2(%arg2)
+        movdqu     \TMP5, HashKey_2(%arg2)
 # HashKey_2 = HashKey^2<<1 (mod poly)
         pshufd     $78, \TMP5, \TMP1
         pxor       \TMP5, \TMP1
-        movdqa     \TMP1, HashKey_2_k(%arg2)
+        movdqu     \TMP1, HashKey_2_k(%arg2)
 
         GHASH_MUL  \TMP5, \TMP3, \TMP1, \TMP2, \TMP4, \TMP6, \TMP7
 # TMP5 = HashKey^3<<1 (mod poly)
-        movdqa     \TMP5, HashKey_3(%arg2)
+        movdqu     \TMP5, HashKey_3(%arg2)
         pshufd     $78, \TMP5, \TMP1
         pxor       \TMP5, \TMP1
-        movdqa     \TMP1, HashKey_3_k(%arg2)
+        movdqu     \TMP1, HashKey_3_k(%arg2)
 
         GHASH_MUL  \TMP5, \TMP3, \TMP1, \TMP2, \TMP4, \TMP6, \TMP7
 # TMP5 = HashKey^3<<1 (mod poly)
-        movdqa     \TMP5, HashKey_4(%arg2)
+        movdqu     \TMP5, HashKey_4(%arg2)
         pshufd     $78, \TMP5, \TMP1
         pxor       \TMP5, \TMP1
-        movdqa     \TMP1, HashKey_4_k(%arg2)
+        movdqu     \TMP1, HashKey_4_k(%arg2)
 .endm
 
 # GCM_INIT initializes a gcm_context struct to prepare for encoding/decoding.
@@ -271,7 +271,7 @@ ALL_F:      .octa 0xffffffffffffffffffffffffffffffff
         movdqu %xmm0, CurCount(%arg2) # ctx_data.current_counter = iv
 
         PRECOMPUTE \SUBKEY, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
-        movdqa HashKey(%arg2), %xmm13
+        movdqu HashKey(%arg2), %xmm13
 
         CALC_AAD_HASH %xmm13, \AAD, \AADLEN, %xmm0, %xmm1, %xmm2, %xmm3, \
         %xmm4, %xmm5, %xmm6
@@ -997,7 +997,7 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation
         pshufd    $78, \XMM5, \TMP6
         pxor      \XMM5, \TMP6
         paddd     ONE(%rip), \XMM0              # INCR CNT
-        movdqa    HashKey_4(%arg2), \TMP5
+        movdqu    HashKey_4(%arg2), \TMP5
         PCLMULQDQ 0x11, \TMP5, \TMP4           # TMP4 = a1*b1
         movdqa    \XMM0, \XMM1
         paddd     ONE(%rip), \XMM0              # INCR CNT
@@ -1016,7 +1016,7 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation
         pxor      (%arg1), \XMM2
         pxor      (%arg1), \XMM3
         pxor      (%arg1), \XMM4
-        movdqa    HashKey_4_k(%arg2), \TMP5
+        movdqu    HashKey_4_k(%arg2), \TMP5
         PCLMULQDQ 0x00, \TMP5, \TMP6           # TMP6 = (a1+a0)*(b1+b0)
         movaps 0x10(%arg1), \TMP1
         AESENC    \TMP1, \XMM1              # Round 1
@@ -1031,7 +1031,7 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation
         movdqa    \XMM6, \TMP1
         pshufd    $78, \XMM6, \TMP2
         pxor      \XMM6, \TMP2
-        movdqa    HashKey_3(%arg2), \TMP5
+        movdqu    HashKey_3(%arg2), \TMP5
         PCLMULQDQ 0x11, \TMP5, \TMP1           # TMP1 = a1 * b1
         movaps 0x30(%arg1), \TMP3
         AESENC    \TMP3, \XMM1              # Round 3
@@ -1044,7 +1044,7 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation
         AESENC    \TMP3, \XMM2
         AESENC    \TMP3, \XMM3
         AESENC    \TMP3, \XMM4
-        movdqa    HashKey_3_k(%arg2), \TMP5
+        movdqu    HashKey_3_k(%arg2), \TMP5
         PCLMULQDQ 0x00, \TMP5, \TMP2           # TMP2 = (a1+a0)*(b1+b0)
         movaps 0x50(%arg1), \TMP3
         AESENC    \TMP3, \XMM1              # Round 5
@@ -1058,7 +1058,7 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation
         movdqa    \XMM7, \TMP1
         pshufd    $78, \XMM7, \TMP2
         pxor      \XMM7, \TMP2
-        movdqa    HashKey_2(%arg2), \TMP5
+        movdqu    HashKey_2(%arg2), \TMP5
 
         # Multiply TMP5 * HashKey using karatsuba
 
@@ -1074,7 +1074,7 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation
         AESENC    \TMP3, \XMM2
         AESENC    \TMP3, \XMM3
         AESENC    \TMP3, \XMM4
-        movdqa    HashKey_2_k(%arg2), \TMP5
+        movdqu    HashKey_2_k(%arg2), \TMP5
         PCLMULQDQ 0x00, \TMP5, \TMP2           # TMP2 = (a1+a0)*(b1+b0)
         movaps 0x80(%arg1), \TMP3
         AESENC    \TMP3, \XMM1             # Round 8
@@ -1092,7 +1092,7 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation
         movdqa    \XMM8, \TMP1
         pshufd    $78, \XMM8, \TMP2
         pxor      \XMM8, \TMP2
-        movdqa    HashKey(%arg2), \TMP5
+        movdqu    HashKey(%arg2), \TMP5
         PCLMULQDQ 0x11, \TMP5, \TMP1          # TMP1 = a1*b1
         movaps 0x90(%arg1), \TMP3
         AESENC    \TMP3, \XMM1            # Round 9
@@ -1121,7 +1121,7 @@ aes_loop_par_enc_done\@:
         AESENCLAST \TMP3, \XMM2
         AESENCLAST \TMP3, \XMM3
         AESENCLAST \TMP3, \XMM4
-        movdqa    HashKey_k(%arg2), \TMP5
+        movdqu    HashKey_k(%arg2), \TMP5
         PCLMULQDQ 0x00, \TMP5, \TMP2          # TMP2 = (a1+a0)*(b1+b0)
         movdqu    (%arg4,%r11,1), \TMP3
         pxor      \TMP3, \XMM1                 # Ciphertext/Plaintext XOR EK
@@ -1205,7 +1205,7 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation
         pshufd    $78, \XMM5, \TMP6
         pxor      \XMM5, \TMP6
         paddd     ONE(%rip), \XMM0              # INCR CNT
-        movdqa    HashKey_4(%arg2), \TMP5
+        movdqu    HashKey_4(%arg2), \TMP5
         PCLMULQDQ 0x11, \TMP5, \TMP4           # TMP4 = a1*b1
         movdqa    \XMM0, \XMM1
         paddd     ONE(%rip), \XMM0              # INCR CNT
@@ -1224,7 +1224,7 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation
         pxor      (%arg1), \XMM2
         pxor      (%arg1), \XMM3
         pxor      (%arg1), \XMM4
-        movdqa    HashKey_4_k(%arg2), \TMP5
+        movdqu    HashKey_4_k(%arg2), \TMP5
         PCLMULQDQ 0x00, \TMP5, \TMP6           # TMP6 = (a1+a0)*(b1+b0)
         movaps 0x10(%arg1), \TMP1
         AESENC    \TMP1, \XMM1              # Round 1
@@ -1239,7 +1239,7 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation
         movdqa    \XMM6, \TMP1
         pshufd    $78, \XMM6, \TMP2
         pxor      \XMM6, \TMP2
-        movdqa    HashKey_3(%arg2), \TMP5
+        movdqu    HashKey_3(%arg2), \TMP5
         PCLMULQDQ 0x11, \TMP5, \TMP1           # TMP1 = a1 * b1
         movaps 0x30(%arg1), \TMP3
         AESENC    \TMP3, \XMM1              # Round 3
@@ -1252,7 +1252,7 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation
         AESENC    \TMP3, \XMM2
         AESENC    \TMP3, \XMM3
         AESENC    \TMP3, \XMM4
-        movdqa    HashKey_3_k(%arg2), \TMP5
+        movdqu    HashKey_3_k(%arg2), \TMP5
         PCLMULQDQ 0x00, \TMP5, \TMP2           # TMP2 = (a1+a0)*(b1+b0)
         movaps 0x50(%arg1), \TMP3
         AESENC    \TMP3, \XMM1              # Round 5
@@ -1266,7 +1266,7 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation
         movdqa    \XMM7, \TMP1
         pshufd    $78, \XMM7, \TMP2
         pxor      \XMM7, \TMP2
-        movdqa    HashKey_2(%arg2), \TMP5
+        movdqu    HashKey_2(%arg2), \TMP5
 
         # Multiply TMP5 * HashKey using karatsuba
 
@@ -1282,7 +1282,7 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation
         AESENC    \TMP3, \XMM2
         AESENC    \TMP3, \XMM3
         AESENC    \TMP3, \XMM4
-        movdqa    HashKey_2_k(%arg2), \TMP5
+        movdqu    HashKey_2_k(%arg2), \TMP5
         PCLMULQDQ 0x00, \TMP5, \TMP2           # TMP2 = (a1+a0)*(b1+b0)
         movaps 0x80(%arg1), \TMP3
         AESENC    \TMP3, \XMM1             # Round 8
@@ -1300,7 +1300,7 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation
         movdqa    \XMM8, \TMP1
         pshufd    $78, \XMM8, \TMP2
         pxor      \XMM8, \TMP2
-        movdqa    HashKey(%arg2), \TMP5
+        movdqu    HashKey(%arg2), \TMP5
         PCLMULQDQ 0x11, \TMP5, \TMP1          # TMP1 = a1*b1
         movaps 0x90(%arg1), \TMP3
         AESENC    \TMP3, \XMM1            # Round 9
@@ -1329,7 +1329,7 @@ aes_loop_par_dec_done\@:
         AESENCLAST \TMP3, \XMM2
         AESENCLAST \TMP3, \XMM3
         AESENCLAST \TMP3, \XMM4
-        movdqa    HashKey_k(%arg2), \TMP5
+        movdqu    HashKey_k(%arg2), \TMP5
         PCLMULQDQ 0x00, \TMP5, \TMP2          # TMP2 = (a1+a0)*(b1+b0)
         movdqu    (%arg4,%r11,1), \TMP3
         pxor      \TMP3, \XMM1                 # Ciphertext/Plaintext XOR EK
@@ -1405,10 +1405,10 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
         movdqa    \XMM1, \TMP6
         pshufd    $78, \XMM1, \TMP2
         pxor      \XMM1, \TMP2
-        movdqa    HashKey_4(%arg2), \TMP5
+        movdqu    HashKey_4(%arg2), \TMP5
         PCLMULQDQ 0x11, \TMP5, \TMP6       # TMP6 = a1*b1
         PCLMULQDQ 0x00, \TMP5, \XMM1       # XMM1 = a0*b0
-        movdqa    HashKey_4_k(%arg2), \TMP4
+        movdqu    HashKey_4_k(%arg2), \TMP4
         PCLMULQDQ 0x00, \TMP4, \TMP2       # TMP2 = (a1+a0)*(b1+b0)
         movdqa    \XMM1, \XMMDst
         movdqa    \TMP2, \XMM1              # result in TMP6, XMMDst, XMM1
@@ -1418,10 +1418,10 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
         movdqa    \XMM2, \TMP1
         pshufd    $78, \XMM2, \TMP2
         pxor      \XMM2, \TMP2
-        movdqa    HashKey_3(%arg2), \TMP5
+        movdqu    HashKey_3(%arg2), \TMP5
         PCLMULQDQ 0x11, \TMP5, \TMP1       # TMP1 = a1*b1
         PCLMULQDQ 0x00, \TMP5, \XMM2       # XMM2 = a0*b0
-        movdqa    HashKey_3_k(%arg2), \TMP4
+        movdqu    HashKey_3_k(%arg2), \TMP4
         PCLMULQDQ 0x00, \TMP4, \TMP2       # TMP2 = (a1+a0)*(b1+b0)
         pxor      \TMP1, \TMP6
         pxor      \XMM2, \XMMDst
@@ -1433,10 +1433,10 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
         movdqa    \XMM3, \TMP1
         pshufd    $78, \XMM3, \TMP2
         pxor      \XMM3, \TMP2
-        movdqa    HashKey_2(%arg2), \TMP5
+        movdqu    HashKey_2(%arg2), \TMP5
         PCLMULQDQ 0x11, \TMP5, \TMP1       # TMP1 = a1*b1
         PCLMULQDQ 0x00, \TMP5, \XMM3       # XMM3 = a0*b0
-        movdqa    HashKey_2_k(%arg2), \TMP4
+        movdqu    HashKey_2_k(%arg2), \TMP4
         PCLMULQDQ 0x00, \TMP4, \TMP2       # TMP2 = (a1+a0)*(b1+b0)
         pxor      \TMP1, \TMP6
         pxor      \XMM3, \XMMDst
@@ -1446,10 +1446,10 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
         movdqa    \XMM4, \TMP1
         pshufd    $78, \XMM4, \TMP2
         pxor      \XMM4, \TMP2
-        movdqa    HashKey(%arg2), \TMP5
+        movdqu    HashKey(%arg2), \TMP5
         PCLMULQDQ 0x11, \TMP5, \TMP1        # TMP1 = a1*b1
         PCLMULQDQ 0x00, \TMP5, \XMM4       # XMM4 = a0*b0
-        movdqa    HashKey_k(%arg2), \TMP4
+        movdqu    HashKey_k(%arg2), \TMP4
         PCLMULQDQ 0x00, \TMP4, \TMP2       # TMP2 = (a1+a0)*(b1+b0)
         pxor      \TMP1, \TMP6
         pxor      \XMM4, \XMMDst
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 5f4829f10129..dfb2f7c0d019 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -2465,7 +2465,7 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs
 
         perf_callchain_store(entry, regs->ip);
 
-        if (!current->mm)
+        if (!nmi_uaccess_okay())
                 return;
 
         if (perf_callchain_user32(regs, entry))
diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
index c14f2a74b2be..15450a675031 100644
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -33,7 +33,8 @@ extern inline unsigned long native_save_fl(void)
         return flags;
 }
 
-static inline void native_restore_fl(unsigned long flags)
+extern inline void native_restore_fl(unsigned long flags);
+extern inline void native_restore_fl(unsigned long flags)
 {
         asm volatile("push %0 ; popf"
                      : /* no output */
diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
index a564084c6141..f8b1ad2c3828 100644
--- a/arch/x86/include/asm/pgtable-3level.h
+++ b/arch/x86/include/asm/pgtable-3level.h
@@ -2,6 +2,8 @@
 #ifndef _ASM_X86_PGTABLE_3LEVEL_H
 #define _ASM_X86_PGTABLE_3LEVEL_H
 
+#include <asm/atomic64_32.h>
+
 /*
  * Intel Physical Address Extension (PAE) Mode - three-level page
  * tables on PPro+ CPUs.
@@ -150,10 +152,7 @@ static inline pte_t native_ptep_get_and_clear(pte_t *ptep)
 {
         pte_t res;
 
-        /* xchg acts as a barrier before the setting of the high bits */
-        res.pte_low = xchg(&ptep->pte_low, 0);
-        res.pte_high = ptep->pte_high;
-        ptep->pte_high = 0;
+        res.pte = (pteval_t)arch_atomic64_xchg((atomic64_t *)ptep, 0);
 
         return res;
 }
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index c24297268ebc..d53c54b842da 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -132,6 +132,8 @@ struct cpuinfo_x86 {
         /* Index into per_cpu list: */
         u16                     cpu_index;
         u32                     microcode;
+        /* Address space bits used by the cache internally */
+        u8                      x86_cache_bits;
         unsigned                initialized : 1;
 } __randomize_layout;
 
@@ -183,7 +185,7 @@ extern void cpu_detect(struct cpuinfo_x86 *c);
 
 static inline unsigned long long l1tf_pfn_limit(void)
 {
-        return BIT_ULL(boot_cpu_data.x86_phys_bits - 1 - PAGE_SHIFT);
+        return BIT_ULL(boot_cpu_data.x86_cache_bits - 1 - PAGE_SHIFT);
 }
 
 extern void early_cpu_init(void);
diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
index 5f9012ff52ed..33d3c88a7225 100644
--- a/arch/x86/include/asm/signal.h
+++ b/arch/x86/include/asm/signal.h
@@ -39,6 +39,7 @@ extern void do_signal(struct pt_regs *regs);
 
 #define __ARCH_HAS_SA_RESTORER
 
+#include <asm/asm.h>
 #include <uapi/asm/sigcontext.h>
 
 #ifdef __i386__
@@ -86,9 +87,9 @@ static inline int __const_sigismember(sigset_t *set, int _sig)
 
 static inline int __gen_sigismember(sigset_t *set, int _sig)
 {
-        unsigned char ret;
-        asm("btl %2,%1\n\tsetc %0"
-            : "=qm"(ret) : "m"(*set), "Ir"(_sig-1) : "cc");
+        bool ret;
+        asm("btl %2,%1" CC_SET(c)
+            : CC_OUT(c) (ret) : "m"(*set), "Ir"(_sig-1));
         return ret;
 }
 
diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
index b6dc698f992a..f335aad404a4 100644
--- a/arch/x86/include/asm/stacktrace.h
+++ b/arch/x86/include/asm/stacktrace.h
@@ -111,6 +111,6 @@ static inline unsigned long caller_frame_pointer(void)
         return (unsigned long)frame;
 }
 
-void show_opcodes(u8 *rip, const char *loglvl);
+void show_opcodes(struct pt_regs *regs, const char *loglvl);
 void show_ip(struct pt_regs *regs, const char *loglvl);
 #endif /* _ASM_X86_STACKTRACE_H */
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index 29c9da6c62fc..58ce5288878e 100644
--- a/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@ -175,8 +175,16 @@ struct tlb_state {
          * are on.  This means that it may not match current->active_mm,
          * which will contain the previous user mm when we're in lazy TLB
          * mode even if we've already switched back to swapper_pg_dir.
+         *
+         * During switch_mm_irqs_off(), loaded_mm will be set to
+         * LOADED_MM_SWITCHING during the brief interrupts-off window
+         * when CR3 and loaded_mm would otherwise be inconsistent.  This
+         * is for nmi_uaccess_okay()'s benefit.
          */
         struct mm_struct *loaded_mm;
+
+#define LOADED_MM_SWITCHING ((struct mm_struct *)1)
+
         u16 loaded_mm_asid;
         u16 next_asid;
         /* last user mm's ctx id */
@@ -246,6 +254,38 @@ struct tlb_state {
 };
 DECLARE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate);
 
+/*
+ * Blindly accessing user memory from NMI context can be dangerous
+ * if we're in the middle of switching the current user task or
+ * switching the loaded mm.  It can also be dangerous if we
+ * interrupted some kernel code that was temporarily using a
+ * different mm.
+ */
+static inline bool nmi_uaccess_okay(void)
+{
+        struct mm_struct *loaded_mm = this_cpu_read(cpu_tlbstate.loaded_mm);
+        struct mm_struct *current_mm = current->mm;
+
+        VM_WARN_ON_ONCE(!loaded_mm);
+
+        /*
+         * The condition we want to check is
+         * current_mm->pgd == __va(read_cr3_pa()).  This may be slow, though,
+         * if we're running in a VM with shadow paging, and nmi_uaccess_okay()
+         * is supposed to be reasonably fast.
+         *
+         * Instead, we check the almost equivalent but somewhat conservative
+         * condition below, and we rely on the fact that switch_mm_irqs_off()
+         * sets loaded_mm to LOADED_MM_SWITCHING before writing to CR3.
+         */
+        if (loaded_mm != current_mm)
+                return false;
+
+        VM_WARN_ON_ONCE(current_mm->pgd != __va(read_cr3_pa()));
+
+        return true;
+}
+
 /* Initialize cr4 shadow for this CPU. */
 static inline void cr4_init_shadow(void)
 {
diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h
index fb856c9f0449..53748541c487 100644
--- a/arch/x86/include/asm/vgtod.h
+++ b/arch/x86/include/asm/vgtod.h
@@ -93,7 +93,7 @@ static inline unsigned int __getcpu(void)
          *
          * If RDPID is available, use it.
          */
-        alternative_io ("lsl %[p],%[seg]",
+        alternative_io ("lsl %[seg],%[p]",
                         ".byte 0xf3,0x0f,0xc7,0xf8", /* RDPID %eax/rax */
                         X86_FEATURE_RDPID,
                         [p] "=a" (p), [seg] "r" (__PER_CPU_SEG));
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 014f214da581..b9d5e7c9ef43 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -684,8 +684,6 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
  * It means the size must be writable atomically and the address must be aligned
  * in a way that permits an atomic write. It also makes sure we fit on a single
  * page.
- *
- * Note: Must be called under text_mutex.
  */
 void *text_poke(void *addr, const void *opcode, size_t len)
 {
@@ -700,6 +698,8 @@ void *text_poke(void *addr, const void *opcode, size_t len)
          */
         BUG_ON(!after_bootmem);
 
+        lockdep_assert_held(&text_mutex);
+
         if (!core_kernel_text((unsigned long)addr)) {
                 pages[0] = vmalloc_to_page(addr);
                 pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
@@ -782,8 +782,6 @@ int poke_int3_handler(struct pt_regs *regs)
  *      - replace the first byte (int3) by the first byte of
  *        replacing opcode
  *      - sync cores
- *
- * Note: must be called under text_mutex.
  */
 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
 {
@@ -792,6 +790,9 @@ void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
         bp_int3_handler = handler;
         bp_int3_addr = (u8 *)addr + sizeof(int3);
         bp_patching_in_progress = true;
+
+        lockdep_assert_held(&text_mutex);
+
         /*
          * Corresponding read barrier in int3 notifier for making sure the
          * in_progress and handler are correctly ordered wrt. patching.
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 4c2313d0b9ca..40bdaea97fe7 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -668,6 +668,45 @@ EXPORT_SYMBOL_GPL(l1tf_mitigation);
 enum vmx_l1d_flush_state l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_AUTO;
 EXPORT_SYMBOL_GPL(l1tf_vmx_mitigation);
 
+/*
+ * These CPUs all support 44bits physical address space internally in the
+ * cache but CPUID can report a smaller number of physical address bits.
+ *
+ * The L1TF mitigation uses the top most address bit for the inversion of
+ * non present PTEs. When the installed memory reaches into the top most
+ * address bit due to memory holes, which has been observed on machines
+ * which report 36bits physical address bits and have 32G RAM installed,
+ * then the mitigation range check in l1tf_select_mitigation() triggers.
+ * This is a false positive because the mitigation is still possible due to
+ * the fact that the cache uses 44bit internally. Use the cache bits
+ * instead of the reported physical bits and adjust them on the affected
+ * machines to 44bit if the reported bits are less than 44.
+ */
+static void override_cache_bits(struct cpuinfo_x86 *c)
+{
+        if (c->x86 != 6)
+                return;
+
+        switch (c->x86_model) {
+        case INTEL_FAM6_NEHALEM:
+        case INTEL_FAM6_WESTMERE:
+        case INTEL_FAM6_SANDYBRIDGE:
+        case INTEL_FAM6_IVYBRIDGE:
+        case INTEL_FAM6_HASWELL_CORE:
+        case INTEL_FAM6_HASWELL_ULT:
+        case INTEL_FAM6_HASWELL_GT3E:
+        case INTEL_FAM6_BROADWELL_CORE:
+        case INTEL_FAM6_BROADWELL_GT3E:
+        case INTEL_FAM6_SKYLAKE_MOBILE:
+        case INTEL_FAM6_SKYLAKE_DESKTOP:
+        case INTEL_FAM6_KABYLAKE_MOBILE:
+        case INTEL_FAM6_KABYLAKE_DESKTOP:
+                if (c->x86_cache_bits < 44)
+                        c->x86_cache_bits = 44;
+                break;
+        }
+}
+
 static void __init l1tf_select_mitigation(void)
 {
         u64 half_pa;
@@ -675,6 +714,8 @@ static void __init l1tf_select_mitigation(void)
         if (!boot_cpu_has_bug(X86_BUG_L1TF))
                 return;
 
+        override_cache_bits(&boot_cpu_data);
+
         switch (l1tf_mitigation) {
         case L1TF_MITIGATION_OFF:
         case L1TF_MITIGATION_FLUSH_NOWARN:
@@ -694,11 +735,6 @@ static void __init l1tf_select_mitigation(void)
         return;
 #endif
 
-        /*
-         * This is extremely unlikely to happen because almost all
-         * systems have far more MAX_PA/2 than RAM can be fit into
-         * DIMM slots.
-         */
         half_pa = (u64)l1tf_pfn_limit() << PAGE_SHIFT;
         if (e820__mapped_any(half_pa, ULLONG_MAX - half_pa, E820_TYPE_RAM)) {
                 pr_warn("System has more than MAX_PA/2 memory. L1TF mitigation not effective.\n");
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 84dee5ab745a..44c4ef3d989b 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -919,6 +919,7 @@ void get_cpu_address_sizes(struct cpuinfo_x86 *c)
         else if (cpu_has(c, X86_FEATURE_PAE) || cpu_has(c, X86_FEATURE_PSE36))
                 c->x86_phys_bits = 36;
 #endif
+        c->x86_cache_bits = c->x86_phys_bits;
 }
 
 static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c)
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 401e8c133108..fc3c07fe7df5 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -150,6 +150,9 @@ static bool bad_spectre_microcode(struct cpuinfo_x86 *c)
         if (cpu_has(c, X86_FEATURE_HYPERVISOR))
                 return false;
 
+        if (c->x86 != 6)
+                return false;
+
         for (i = 0; i < ARRAY_SIZE(spectre_bad_microcodes); i++) {
                 if (c->x86_model == spectre_bad_microcodes[i].model &&
                     c->x86_stepping == spectre_bad_microcodes[i].stepping)
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 9c8652974f8e..f56895106ccf 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -17,6 +17,7 @@
 #include <linux/bug.h>
 #include <linux/nmi.h>
 #include <linux/sysfs.h>
+#include <linux/kasan.h>
 
 #include <asm/cpu_entry_area.h>
 #include <asm/stacktrace.h>
@@ -89,14 +90,24 @@ static void printk_stack_address(unsigned long address, int reliable,
  * Thus, the 2/3rds prologue and 64 byte OPCODE_BUFSIZE is just a random
  * guesstimate in attempt to achieve all of the above.
  */
-void show_opcodes(u8 *rip, const char *loglvl)
+void show_opcodes(struct pt_regs *regs, const char *loglvl)
 {
 #define PROLOGUE_SIZE 42
 #define EPILOGUE_SIZE 21
 #define OPCODE_BUFSIZE (PROLOGUE_SIZE + 1 + EPILOGUE_SIZE)
         u8 opcodes[OPCODE_BUFSIZE];
+        unsigned long prologue = regs->ip - PROLOGUE_SIZE;
+        bool bad_ip;
 
-        if (probe_kernel_read(opcodes, rip - PROLOGUE_SIZE, OPCODE_BUFSIZE)) {
+        /*
+         * Make sure userspace isn't trying to trick us into dumping kernel
+         * memory by pointing the userspace instruction pointer at it.
+         */
+        bad_ip = user_mode(regs) &&
+                __chk_range_not_ok(prologue, OPCODE_BUFSIZE, TASK_SIZE_MAX);
+
+        if (bad_ip || probe_kernel_read(opcodes, (u8 *)prologue,
+                                        OPCODE_BUFSIZE)) {
                 printk("%sCode: Bad RIP value.\n", loglvl);
         } else {
                 printk("%sCode: %" __stringify(PROLOGUE_SIZE) "ph <%02x> %"
@@ -112,7 +123,7 @@ void show_ip(struct pt_regs *regs, const char *loglvl)
 #else
         printk("%sRIP: %04x:%pS\n", loglvl, (int)regs->cs, (void *)regs->ip);
 #endif
-        show_opcodes((u8 *)regs->ip, loglvl);
+        show_opcodes(regs, loglvl);
 }
 
 void show_iret_regs(struct pt_regs *regs)
@@ -346,7 +357,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
          * We're not going to return, but we might be on an IST stack or
          * have very little stack space left.  Rewind the stack and kill
          * the task.
+         * Before we rewind the stack, we have to tell KASAN that we're going to
+         * reuse the task stack and that existing poisons are invalid.
          */
+        kasan_unpoison_task_stack(current);
         rewind_stack_do_exit(signr);
 }
 NOKPROBE_SYMBOL(oops_end);
diff --git a/arch/x86/lib/usercopy.c b/arch/x86/lib/usercopy.c
index c8c6ad0d58b8..3f435d7fca5e 100644
--- a/arch/x86/lib/usercopy.c
+++ b/arch/x86/lib/usercopy.c
@@ -7,6 +7,8 @@
 #include <linux/uaccess.h>
 #include <linux/export.h>
 
+#include <asm/tlbflush.h>
+
 /*
  * We rely on the nested NMI work to allow atomic faults from the NMI path; the
  * nested NMI paths are careful to preserve CR2.
@@ -19,6 +21,9 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n)
         if (__range_not_ok(from, n, TASK_SIZE))
                 return n;
 
+        if (!nmi_uaccess_okay())
+                return n;
+
         /*
          * Even though this function is typically called from NMI/IRQ context
          * disable pagefaults so that its behaviour is consistent even when
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index b9123c497e0a..47bebfe6efa7 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -837,7 +837,7 @@ show_signal_msg(struct pt_regs *regs, unsigned long error_code,
 
         printk(KERN_CONT "\n");
 
-        show_opcodes((u8 *)regs->ip, loglvl);
+        show_opcodes(regs, loglvl);
 }
 
 static void
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 8d6c34fe49be..51a5a69ecac9 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -1420,6 +1420,29 @@ static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias)
         return 0;
 }
 
+/*
+ * Machine check recovery code needs to change cache mode of poisoned
+ * pages to UC to avoid speculative access logging another error. But
+ * passing the address of the 1:1 mapping to set_memory_uc() is a fine
+ * way to encourage a speculative access. So we cheat and flip the top
+ * bit of the address. This works fine for the code that updates the
+ * page tables. But at the end of the process we need to flush the cache
+ * and the non-canonical address causes a #GP fault when used by the
+ * CLFLUSH instruction.
+ *
+ * But in the common case we already have a canonical address. This code
+ * will fix the top bit if needed and is a no-op otherwise.
+ */
+static inline unsigned long make_addr_canonical_again(unsigned long addr)
+{
+#ifdef CONFIG_X86_64
+        return (long)(addr << 1) >> 1;
+#else
+        return addr;
+#endif
+}
+
+
 static int change_page_attr_set_clr(unsigned long *addr, int numpages,
                                     pgprot_t mask_set, pgprot_t mask_clr,
                                     int force_split, int in_flag,
@@ -1465,7 +1488,7 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,
                  * Save address for cache flush. *addr is modified in the call
                  * to __change_page_attr_set_clr() below.
                  */
-                baddr = *addr;
+                baddr = make_addr_canonical_again(*addr);
         }
 
         /* Must avoid aliasing mappings in the highmem code */
diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c
index 31341ae7309f..c1fc1ae6b429 100644
--- a/arch/x86/mm/pti.c
+++ b/arch/x86/mm/pti.c
@@ -248,7 +248,7 @@ static pmd_t *pti_user_pagetable_walk_pmd(unsigned long address)
  *
  * Returns a pointer to a PTE on success, or NULL on failure.
  */
-static __init pte_t *pti_user_pagetable_walk_pte(unsigned long address)
+static pte_t *pti_user_pagetable_walk_pte(unsigned long address)
 {
         gfp_t gfp = (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO);
         pmd_t *pmd;
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 9517d1b2a281..e96b99eb800c 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -305,6 +305,10 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
 
                 choose_new_asid(next, next_tlb_gen, &new_asid, &need_flush);
 
+                /* Let nmi_uaccess_okay() know that we're changing CR3. */
+                this_cpu_write(cpu_tlbstate.loaded_mm, LOADED_MM_SWITCHING);
+                barrier();
+
                 if (need_flush) {
                         this_cpu_write(cpu_tlbstate.ctxs[new_asid].ctx_id, next->context.ctx_id);
                         this_cpu_write(cpu_tlbstate.ctxs[new_asid].tlb_gen, next_tlb_gen);
@@ -335,6 +339,9 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
                 if (next != &init_mm)
                         this_cpu_write(cpu_tlbstate.last_ctx_id, next->context.ctx_id);
 
+                /* Make sure we write CR3 before loaded_mm. */
+                barrier();
+
                 this_cpu_write(cpu_tlbstate.loaded_mm, next);
                 this_cpu_write(cpu_tlbstate.loaded_mm_asid, new_asid);
         }
diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
index 324b93328b37..05ca14222463 100644
--- a/arch/x86/platform/efi/efi_32.c
+++ b/arch/x86/platform/efi/efi_32.c
@@ -85,14 +85,10 @@ pgd_t * __init efi_call_phys_prolog(void)
 
 void __init efi_call_phys_epilog(pgd_t *save_pgd)
 {
-        struct desc_ptr gdt_descr;
-
-        gdt_descr.address = (unsigned long)get_cpu_gdt_rw(0);
-        gdt_descr.size = GDT_SIZE - 1;
-        load_gdt(&gdt_descr);
-
         load_cr3(save_pgd);
         __flush_tlb_all();
+
+        load_fixmap_gdt(0);
 }
 
 void __init efi_runtime_update_mappings(void)
diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c
index 45b700ac5fe7..2fe5c9b1816b 100644
--- a/arch/x86/xen/mmu_pv.c
+++ b/arch/x86/xen/mmu_pv.c
@@ -435,14 +435,13 @@ static void xen_set_pud(pud_t *ptr, pud_t val)
 static void xen_set_pte_atomic(pte_t *ptep, pte_t pte)
 {
         trace_xen_mmu_set_pte_atomic(ptep, pte);
-        set_64bit((u64 *)ptep, native_pte_val(pte));
+        __xen_set_pte(ptep, pte);
 }
 
 static void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
         trace_xen_mmu_pte_clear(mm, addr, ptep);
-        if (!xen_batched_set_pte(ptep, native_make_pte(0)))
-                native_pte_clear(mm, addr, ptep);
+        __xen_set_pte(ptep, native_make_pte(0));
 }
 
 static void xen_pmd_clear(pmd_t *pmdp)
@@ -1570,7 +1569,7 @@ static void __init xen_set_pte_init(pte_t *ptep, pte_t pte)
                 pte = __pte_ma(((pte_val_ma(*ptep) & _PAGE_RW) | ~_PAGE_RW) &
                                pte_val_ma(pte));
 #endif
-        native_set_pte(ptep, pte);
+        __xen_set_pte(ptep, pte);
 }
 
 /* Early in boot, while setting up the initial pagetable, assume
@@ -2061,7 +2060,6 @@ void __init xen_relocate_p2m(void)
         pud_t *pud;
         pgd_t *pgd;
         unsigned long *new_p2m;
-        int save_pud;
 
         size = PAGE_ALIGN(xen_start_info->nr_pages * sizeof(unsigned long));
         n_pte = roundup(size, PAGE_SIZE) >> PAGE_SHIFT;
@@ -2091,7 +2089,6 @@ void __init xen_relocate_p2m(void)
 
         pgd = __va(read_cr3_pa());
         new_p2m = (unsigned long *)(2 * PGDIR_SIZE);
-        save_pud = n_pud;
         for (idx_pud = 0; idx_pud < n_pud; idx_pud++) {
                 pud = early_memremap(pud_phys, PAGE_SIZE);
                 clear_page(pud);
diff --git a/block/blk-wbt.c b/block/blk-wbt.c
index 84507d3e9a98..8e20a0677dcf 100644
--- a/block/blk-wbt.c
+++ b/block/blk-wbt.c
@@ -123,16 +123,11 @@ static void rwb_wake_all(struct rq_wb *rwb)
         }
 }
 
-static void __wbt_done(struct rq_qos *rqos, enum wbt_flags wb_acct)
+static void wbt_rqw_done(struct rq_wb *rwb, struct rq_wait *rqw,
+                         enum wbt_flags wb_acct)
 {
-        struct rq_wb *rwb = RQWB(rqos);
-        struct rq_wait *rqw;
         int inflight, limit;
 
-        if (!(wb_acct & WBT_TRACKED))
-                return;
-
-        rqw = get_rq_wait(rwb, wb_acct);
         inflight = atomic_dec_return(&rqw->inflight);
 
         /*
@@ -166,10 +161,22 @@ static void __wbt_done(struct rq_qos *rqos, enum wbt_flags wb_acct)
                 int diff = limit - inflight;
 
                 if (!inflight || diff >= rwb->wb_background / 2)
-                        wake_up(&rqw->wait);
+                        wake_up_all(&rqw->wait);
         }
 }
 
+static void __wbt_done(struct rq_qos *rqos, enum wbt_flags wb_acct)
+{
+        struct rq_wb *rwb = RQWB(rqos);
+        struct rq_wait *rqw;
+
+        if (!(wb_acct & WBT_TRACKED))
+                return;
+
+        rqw = get_rq_wait(rwb, wb_acct);
+        wbt_rqw_done(rwb, rqw, wb_acct);
+}
+
 /*
  * Called on completion of a request. Note that it's also called when
  * a request is merged, when the request gets freed.
@@ -481,6 +488,34 @@ static inline unsigned int get_limit(struct rq_wb *rwb, unsigned long rw)
         return limit;
 }
 
+struct wbt_wait_data {
+        struct wait_queue_entry wq;
+        struct task_struct *task;
+        struct rq_wb *rwb;
+        struct rq_wait *rqw;
+        unsigned long rw;
+        bool got_token;
+};
+
+static int wbt_wake_function(struct wait_queue_entry *curr, unsigned int mode,
+                             int wake_flags, void *key)
+{
+        struct wbt_wait_data *data = container_of(curr, struct wbt_wait_data,
+                                                        wq);
+
+        /*
+         * If we fail to get a budget, return -1 to interrupt the wake up
+         * loop in __wake_up_common.
+         */
+        if (!rq_wait_inc_below(data->rqw, get_limit(data->rwb, data->rw)))
+                return -1;
+
+        data->got_token = true;
+        list_del_init(&curr->entry);
+        wake_up_process(data->task);
+        return 1;
+}
+
 /*
  * Block if we will exceed our limit, or if we are currently waiting for
  * the timer to kick off queuing again.
@@ -491,19 +526,40 @@ static void __wbt_wait(struct rq_wb *rwb, enum wbt_flags wb_acct,
         __acquires(lock)
 {
         struct rq_wait *rqw = get_rq_wait(rwb, wb_acct);
-        DECLARE_WAITQUEUE(wait, current);
+        struct wbt_wait_data data = {
+                .wq = {
+                        .func   = wbt_wake_function,
+                        .entry  = LIST_HEAD_INIT(data.wq.entry),
+                },
+                .task = current,
+                .rwb = rwb,
+                .rqw = rqw,
+                .rw = rw,
+        };
         bool has_sleeper;
 
         has_sleeper = wq_has_sleeper(&rqw->wait);
         if (!has_sleeper && rq_wait_inc_below(rqw, get_limit(rwb, rw)))
                 return;
 
-        add_wait_queue_exclusive(&rqw->wait, &wait);
+        prepare_to_wait_exclusive(&rqw->wait, &data.wq, TASK_UNINTERRUPTIBLE);
         do {
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                if (data.got_token)
+                        break;
 
-                if (!has_sleeper && rq_wait_inc_below(rqw, get_limit(rwb, rw)))
+                if (!has_sleeper &&
+                    rq_wait_inc_below(rqw, get_limit(rwb, rw))) {
+                        finish_wait(&rqw->wait, &data.wq);
+
+                        /*
+                         * We raced with wbt_wake_function() getting a token,
+                         * which means we now have two. Put our local token
+                         * and wake anyone else potentially waiting for one.
+                         */
+                        if (data.got_token)
+                                wbt_rqw_done(rwb, rqw, wb_acct);
                         break;
+                }
 
                 if (lock) {
                         spin_unlock_irq(lock);
@@ -511,11 +567,11 @@ static void __wbt_wait(struct rq_wb *rwb, enum wbt_flags wb_acct,
                         spin_lock_irq(lock);
                 } else
                         io_schedule();
+
                 has_sleeper = false;
         } while (1);
 
-        __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&rqw->wait, &wait);
+        finish_wait(&rqw->wait, &data.wq);
 }
 
 static inline bool wbt_should_throttle(struct rq_wb *rwb, struct bio *bio)
@@ -580,11 +636,6 @@ static void wbt_wait(struct rq_qos *rqos, struct bio *bio, spinlock_t *lock)
                 return;
         }
 
-        if (current_is_kswapd())
-                flags |= WBT_KSWAPD;
-        if (bio_op(bio) == REQ_OP_DISCARD)
-                flags |= WBT_DISCARD;
-
         __wbt_wait(rwb, flags, bio->bi_opf, lock);
 
         if (!blk_stat_is_active(rwb->cb))
diff --git a/block/bsg.c b/block/bsg.c
index db588add6ba6..9a442c23a715 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -37,7 +37,7 @@ struct bsg_device {
         struct request_queue *queue;
         spinlock_t lock;
         struct hlist_node dev_list;
-        atomic_t ref_count;
+        refcount_t ref_count;
         char name[20];
         int max_queue;
 };
@@ -252,7 +252,7 @@ static int bsg_put_device(struct bsg_device *bd)
 
         mutex_lock(&bsg_mutex);
 
-        if (!atomic_dec_and_test(&bd->ref_count)) {
+        if (!refcount_dec_and_test(&bd->ref_count)) {
                 mutex_unlock(&bsg_mutex);
                 return 0;
         }
@@ -290,7 +290,7 @@ static struct bsg_device *bsg_add_device(struct inode *inode,
 
         bd->queue = rq;
 
-        atomic_set(&bd->ref_count, 1);
+        refcount_set(&bd->ref_count, 1);
         hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(iminor(inode)));
 
         strncpy(bd->name, dev_name(rq->bsg_dev.class_dev), sizeof(bd->name) - 1);
@@ -308,7 +308,7 @@ static struct bsg_device *__bsg_get_device(int minor, struct request_queue *q)
 
         hlist_for_each_entry(bd, bsg_dev_idx_hash(minor), dev_list) {
                 if (bd->queue == q) {
-                        atomic_inc(&bd->ref_count);
+                        refcount_inc(&bd->ref_count);
                         goto found;
                 }
         }
diff --git a/block/elevator.c b/block/elevator.c
index 5ea6e7d600e4..6a06b5d040e5 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -895,8 +895,7 @@ int elv_register(struct elevator_type *e)
         spin_lock(&elv_list_lock);
         if (elevator_find(e->elevator_name, e->uses_mq)) {
                 spin_unlock(&elv_list_lock);
-                if (e->icq_cache)
-                        kmem_cache_destroy(e->icq_cache);
+                kmem_cache_destroy(e->icq_cache);
                 return -EBUSY;
         }
         list_add_tail(&e->list, &elv_list);
diff --git a/drivers/ata/pata_ftide010.c b/drivers/ata/pata_ftide010.c
index 5d4b72e21161..569a4a662dcd 100644
--- a/drivers/ata/pata_ftide010.c
+++ b/drivers/ata/pata_ftide010.c
@@ -256,14 +256,12 @@ static struct ata_port_operations pata_ftide010_port_ops = {
         .qc_issue       = ftide010_qc_issue,
 };
 
-static struct ata_port_info ftide010_port_info[] = {
-        {
-                .flags          = ATA_FLAG_SLAVE_POSS,
-                .mwdma_mask     = ATA_MWDMA2,
-                .udma_mask      = ATA_UDMA6,
-                .pio_mask       = ATA_PIO4,
-                .port_ops       = &pata_ftide010_port_ops,
-        },
+static struct ata_port_info ftide010_port_info = {
+        .flags          = ATA_FLAG_SLAVE_POSS,
+        .mwdma_mask     = ATA_MWDMA2,
+        .udma_mask      = ATA_UDMA6,
+        .pio_mask       = ATA_PIO4,
+        .port_ops       = &pata_ftide010_port_ops,
 };
 
 #if IS_ENABLED(CONFIG_SATA_GEMINI)
@@ -349,6 +347,7 @@ static int pata_ftide010_gemini_cable_detect(struct ata_port *ap)
 }
 
 static int pata_ftide010_gemini_init(struct ftide010 *ftide,
+                                     struct ata_port_info *pi,
                                      bool is_ata1)
 {
         struct device *dev = ftide->dev;
@@ -373,7 +372,13 @@ static int pata_ftide010_gemini_init(struct ftide010 *ftide,
 
         /* Flag port as SATA-capable */
         if (gemini_sata_bridge_enabled(sg, is_ata1))
-                ftide010_port_info[0].flags |= ATA_FLAG_SATA;
+                pi->flags |= ATA_FLAG_SATA;
+
+        /* This device has broken DMA, only PIO works */
+        if (of_machine_is_compatible("itian,sq201")) {
+                pi->mwdma_mask = 0;
+                pi->udma_mask = 0;
+        }
 
         /*
          * We assume that a simple 40-wire cable is used in the PATA mode.
@@ -435,6 +440,7 @@ static int pata_ftide010_gemini_init(struct ftide010 *ftide,
 }
 #else
 static int pata_ftide010_gemini_init(struct ftide010 *ftide,
+                                     struct ata_port_info *pi,
                                      bool is_ata1)
 {
         return -ENOTSUPP;
@@ -446,7 +452,7 @@ static int pata_ftide010_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct device_node *np = dev->of_node;
-        const struct ata_port_info pi = ftide010_port_info[0];
+        struct ata_port_info pi = ftide010_port_info;
         const struct ata_port_info *ppi[] = { &pi, NULL };
         struct ftide010 *ftide;
         struct resource *res;
@@ -490,6 +496,7 @@ static int pata_ftide010_probe(struct platform_device *pdev)
                  * are ATA0. This will also set up the cable types.
                  */
                 ret = pata_ftide010_gemini_init(ftide,
+                                &pi,
                                 (res->start == 0x63400000));
                 if (ret)
                         goto err_dis_clk;
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index 8e2e4757adcb..5a42ae4078c2 100644
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -185,7 +185,7 @@ EXPORT_SYMBOL_GPL(of_pm_clk_add_clk);
 int of_pm_clk_add_clks(struct device *dev)
 {
         struct clk **clks;
-        unsigned int i, count;
+        int i, count;
         int ret;
 
         if (!dev || !dev->of_node)
diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
index b55b245e8052..fd1e19f1a49f 100644
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -84,6 +84,18 @@ MODULE_PARM_DESC(max_persistent_grants,
                  "Maximum number of grants to map persistently");
 
 /*
+ * How long a persistent grant is allowed to remain allocated without being in
+ * use. The time is in seconds, 0 means indefinitely long.
+ */
+
+static unsigned int xen_blkif_pgrant_timeout = 60;
+module_param_named(persistent_grant_unused_seconds, xen_blkif_pgrant_timeout,
+                   uint, 0644);
+MODULE_PARM_DESC(persistent_grant_unused_seconds,
+                 "Time in seconds an unused persistent grant is allowed to "
+                 "remain allocated. Default is 60, 0 means unlimited.");
+
+/*
  * Maximum number of rings/queues blkback supports, allow as many queues as there
  * are CPUs if user has not specified a value.
  */
@@ -123,6 +135,13 @@ module_param(log_stats, int, 0644);
 /* Number of free pages to remove on each call to gnttab_free_pages */
 #define NUM_BATCH_FREE_PAGES 10
 
+static inline bool persistent_gnt_timeout(struct persistent_gnt *persistent_gnt)
+{
+        return xen_blkif_pgrant_timeout &&
+               (jiffies - persistent_gnt->last_used >=
+                HZ * xen_blkif_pgrant_timeout);
+}
+
 static inline int get_free_page(struct xen_blkif_ring *ring, struct page **page)
 {
         unsigned long flags;
@@ -236,8 +255,7 @@ static int add_persistent_gnt(struct xen_blkif_ring *ring,
                 }
         }
 
-        bitmap_zero(persistent_gnt->flags, PERSISTENT_GNT_FLAGS_SIZE);
-        set_bit(PERSISTENT_GNT_ACTIVE, persistent_gnt->flags);
+        persistent_gnt->active = true;
         /* Add new node and rebalance tree. */
         rb_link_node(&(persistent_gnt->node), parent, new);
         rb_insert_color(&(persistent_gnt->node), &ring->persistent_gnts);
@@ -261,11 +279,11 @@ static struct persistent_gnt *get_persistent_gnt(struct xen_blkif_ring *ring,
                 else if (gref > data->gnt)
                         node = node->rb_right;
                 else {
-                        if(test_bit(PERSISTENT_GNT_ACTIVE, data->flags)) {
+                        if (data->active) {
                                 pr_alert_ratelimited("requesting a grant already in use\n");
                                 return NULL;
                         }
-                        set_bit(PERSISTENT_GNT_ACTIVE, data->flags);
+                        data->active = true;
                         atomic_inc(&ring->persistent_gnt_in_use);
                         return data;
                 }
@@ -276,10 +294,10 @@ static struct persistent_gnt *get_persistent_gnt(struct xen_blkif_ring *ring,
 static void put_persistent_gnt(struct xen_blkif_ring *ring,
                                struct persistent_gnt *persistent_gnt)
 {
-        if(!test_bit(PERSISTENT_GNT_ACTIVE, persistent_gnt->flags))
+        if (!persistent_gnt->active)
                 pr_alert_ratelimited("freeing a grant already unused\n");
-        set_bit(PERSISTENT_GNT_WAS_ACTIVE, persistent_gnt->flags);
-        clear_bit(PERSISTENT_GNT_ACTIVE, persistent_gnt->flags);
+        persistent_gnt->last_used = jiffies;
+        persistent_gnt->active = false;
         atomic_dec(&ring->persistent_gnt_in_use);
 }
 
@@ -371,26 +389,26 @@ static void purge_persistent_gnt(struct xen_blkif_ring *ring)
         struct persistent_gnt *persistent_gnt;
         struct rb_node *n;
         unsigned int num_clean, total;
-        bool scan_used = false, clean_used = false;
+        bool scan_used = false;
         struct rb_root *root;
 
-        if (ring->persistent_gnt_c < xen_blkif_max_pgrants ||
-            (ring->persistent_gnt_c == xen_blkif_max_pgrants &&
-            !ring->blkif->vbd.overflow_max_grants)) {
-                goto out;
-        }
-
         if (work_busy(&ring->persistent_purge_work)) {
                 pr_alert_ratelimited("Scheduled work from previous purge is still busy, cannot purge list\n");
                 goto out;
         }
 
-        num_clean = (xen_blkif_max_pgrants / 100) * LRU_PERCENT_CLEAN;
-        num_clean = ring->persistent_gnt_c - xen_blkif_max_pgrants + num_clean;
-        num_clean = min(ring->persistent_gnt_c, num_clean);
-        if ((num_clean == 0) ||
-            (num_clean > (ring->persistent_gnt_c - atomic_read(&ring->persistent_gnt_in_use))))
-                goto out;
+        if (ring->persistent_gnt_c < xen_blkif_max_pgrants ||
+            (ring->persistent_gnt_c == xen_blkif_max_pgrants &&
+            !ring->blkif->vbd.overflow_max_grants)) {
+                num_clean = 0;
+        } else {
+                num_clean = (xen_blkif_max_pgrants / 100) * LRU_PERCENT_CLEAN;
+                num_clean = ring->persistent_gnt_c - xen_blkif_max_pgrants +
+                            num_clean;
+                num_clean = min(ring->persistent_gnt_c, num_clean);
+                pr_debug("Going to purge at least %u persistent grants\n",
+                         num_clean);
+        }
 
         /*
          * At this point, we can assure that there will be no calls
@@ -401,9 +419,7 @@ static void purge_persistent_gnt(struct xen_blkif_ring *ring)
          * number of grants.
          */
 
-        total = num_clean;
-
-        pr_debug("Going to purge %u persistent grants\n", num_clean);
+        total = 0;
 
         BUG_ON(!list_empty(&ring->persistent_purge_list));
         root = &ring->persistent_gnts;
@@ -412,46 +428,37 @@ purge_list:
                 BUG_ON(persistent_gnt->handle ==
                         BLKBACK_INVALID_HANDLE);
 
-                if (clean_used) {
-                        clear_bit(PERSISTENT_GNT_WAS_ACTIVE, persistent_gnt->flags);
+                if (persistent_gnt->active)
                         continue;
-                }
-
-                if (test_bit(PERSISTENT_GNT_ACTIVE, persistent_gnt->flags))
+                if (!scan_used && !persistent_gnt_timeout(persistent_gnt))
                         continue;
-                if (!scan_used &&
-                    (test_bit(PERSISTENT_GNT_WAS_ACTIVE, persistent_gnt->flags)))
+                if (scan_used && total >= num_clean)
                         continue;
 
                 rb_erase(&persistent_gnt->node, root);
                 list_add(&persistent_gnt->remove_node,
                          &ring->persistent_purge_list);
-                if (--num_clean == 0)
-                        goto finished;
+                total++;
         }
         /*
-         * If we get here it means we also need to start cleaning
+         * Check whether we also need to start cleaning
          * grants that were used since last purge in order to cope
          * with the requested num
          */
-        if (!scan_used && !clean_used) {
-                pr_debug("Still missing %u purged frames\n", num_clean);
+        if (!scan_used && total < num_clean) {
+                pr_debug("Still missing %u purged frames\n", num_clean - total);
                 scan_used = true;
                 goto purge_list;
         }
-finished:
-        if (!clean_used) {
-                pr_debug("Finished scanning for grants to clean, removing used flag\n");
-                clean_used = true;
-                goto purge_list;
-        }
 
-        ring->persistent_gnt_c -= (total - num_clean);
-        ring->blkif->vbd.overflow_max_grants = 0;
+        if (total) {
+                ring->persistent_gnt_c -= total;
+                ring->blkif->vbd.overflow_max_grants = 0;
 
-        /* We can defer this work */
-        schedule_work(&ring->persistent_purge_work);
-        pr_debug("Purged %u/%u\n", (total - num_clean), total);
+                /* We can defer this work */
+                schedule_work(&ring->persistent_purge_work);
+                pr_debug("Purged %u/%u\n", num_clean, total);
+        }
 
 out:
         return;
diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h
index ecb35fe8ca8d..1d3002d773f7 100644
--- a/drivers/block/xen-blkback/common.h
+++ b/drivers/block/xen-blkback/common.h
@@ -233,16 +233,6 @@ struct xen_vbd {
 
 struct backend_info;
 
-/* Number of available flags */
-#define PERSISTENT_GNT_FLAGS_SIZE       2
-/* This persistent grant is currently in use */
-#define PERSISTENT_GNT_ACTIVE           0
-/*
- * This persistent grant has been used, this flag is set when we remove the
- * PERSISTENT_GNT_ACTIVE, to know that this grant has been used recently.
- */
-#define PERSISTENT_GNT_WAS_ACTIVE       1
-
 /* Number of requests that we can fit in a ring */
 #define XEN_BLKIF_REQS_PER_PAGE         32
 
@@ -250,7 +240,8 @@ struct persistent_gnt {
         struct page *page;
         grant_ref_t gnt;
         grant_handle_t handle;
-        DECLARE_BITMAP(flags, PERSISTENT_GNT_FLAGS_SIZE);
+        unsigned long last_used;
+        bool active;
         struct rb_node node;
         struct list_head remove_node;
 };
@@ -278,7 +269,6 @@ struct xen_blkif_ring {
         wait_queue_head_t       pending_free_wq;
 
         /* Tree to store persistent grants. */
-        spinlock_t              pers_gnts_lock;
         struct rb_root          persistent_gnts;
         unsigned int            persistent_gnt_c;
         atomic_t                persistent_gnt_in_use;
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 8986adab9bf5..a71d817e900d 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -46,6 +46,7 @@
 #include <linux/scatterlist.h>
 #include <linux/bitmap.h>
 #include <linux/list.h>
+#include <linux/workqueue.h>
 
 #include <xen/xen.h>
 #include <xen/xenbus.h>
@@ -121,6 +122,8 @@ static inline struct blkif_req *blkif_req(struct request *rq)
 
 static DEFINE_MUTEX(blkfront_mutex);
 static const struct block_device_operations xlvbd_block_fops;
+static struct delayed_work blkfront_work;
+static LIST_HEAD(info_list);
 
 /*
  * Maximum number of segments in indirect requests, the actual value used by
@@ -216,6 +219,7 @@ struct blkfront_info
         /* Save uncomplete reqs and bios for migration. */
         struct list_head requests;
         struct bio_list bio_list;
+        struct list_head info_list;
 };
 
 static unsigned int nr_minors;
@@ -1759,6 +1763,12 @@ abort_transaction:
         return err;
 }
 
+static void free_info(struct blkfront_info *info)
+{
+        list_del(&info->info_list);
+        kfree(info);
+}
+
 /* Common code used when first setting up, and when resuming. */
 static int talk_to_blkback(struct xenbus_device *dev,
                            struct blkfront_info *info)
@@ -1880,7 +1890,10 @@ again:
  destroy_blkring:
         blkif_free(info, 0);
 
-        kfree(info);
+        mutex_lock(&blkfront_mutex);
+        free_info(info);
+        mutex_unlock(&blkfront_mutex);
+
         dev_set_drvdata(&dev->dev, NULL);
 
         return err;
@@ -1991,6 +2004,10 @@ static int blkfront_probe(struct xenbus_device *dev,
         info->handle = simple_strtoul(strrchr(dev->nodename, '/')+1, NULL, 0);
         dev_set_drvdata(&dev->dev, info);
 
+        mutex_lock(&blkfront_mutex);
+        list_add(&info->info_list, &info_list);
+        mutex_unlock(&blkfront_mutex);
+
         return 0;
 }
 
@@ -2301,6 +2318,12 @@ static void blkfront_gather_backend_features(struct blkfront_info *info)
         if (indirect_segments <= BLKIF_MAX_SEGMENTS_PER_REQUEST)
                 indirect_segments = 0;
         info->max_indirect_segments = indirect_segments;
+
+        if (info->feature_persistent) {
+                mutex_lock(&blkfront_mutex);
+                schedule_delayed_work(&blkfront_work, HZ * 10);
+                mutex_unlock(&blkfront_mutex);
+        }
 }
 
 /*
@@ -2482,7 +2505,9 @@ static int blkfront_remove(struct xenbus_device *xbdev)
         mutex_unlock(&info->mutex);
 
         if (!bdev) {
-                kfree(info);
+                mutex_lock(&blkfront_mutex);
+                free_info(info);
+                mutex_unlock(&blkfront_mutex);
                 return 0;
         }
 
@@ -2502,7 +2527,9 @@ static int blkfront_remove(struct xenbus_device *xbdev)
         if (info && !bdev->bd_openers) {
                 xlvbd_release_gendisk(info);
                 disk->private_data = NULL;
-                kfree(info);
+                mutex_lock(&blkfront_mutex);
+                free_info(info);
+                mutex_unlock(&blkfront_mutex);
         }
 
         mutex_unlock(&bdev->bd_mutex);
@@ -2585,7 +2612,7 @@ static void blkif_release(struct gendisk *disk, fmode_t mode)
                 dev_info(disk_to_dev(bdev->bd_disk), "releasing disk\n");
                 xlvbd_release_gendisk(info);
                 disk->private_data = NULL;
-                kfree(info);
+                free_info(info);
         }
 
 out:
@@ -2618,6 +2645,61 @@ static struct xenbus_driver blkfront_driver = {
         .is_ready = blkfront_is_ready,
 };
 
+static void purge_persistent_grants(struct blkfront_info *info)
+{
+        unsigned int i;
+        unsigned long flags;
+
+        for (i = 0; i < info->nr_rings; i++) {
+                struct blkfront_ring_info *rinfo = &info->rinfo[i];
+                struct grant *gnt_list_entry, *tmp;
+
+                spin_lock_irqsave(&rinfo->ring_lock, flags);
+
+                if (rinfo->persistent_gnts_c == 0) {
+                        spin_unlock_irqrestore(&rinfo->ring_lock, flags);
+                        continue;
+                }
+
+                list_for_each_entry_safe(gnt_list_entry, tmp, &rinfo->grants,
+                                         node) {
+                        if (gnt_list_entry->gref == GRANT_INVALID_REF ||
+                            gnttab_query_foreign_access(gnt_list_entry->gref))
+                                continue;
+
+                        list_del(&gnt_list_entry->node);
+                        gnttab_end_foreign_access(gnt_list_entry->gref, 0, 0UL);
+                        rinfo->persistent_gnts_c--;
+                        __free_page(gnt_list_entry->page);
+                        kfree(gnt_list_entry);
+                }
+
+                spin_unlock_irqrestore(&rinfo->ring_lock, flags);
+        }
+}
+
+static void blkfront_delay_work(struct work_struct *work)
+{
+        struct blkfront_info *info;
+        bool need_schedule_work = false;
+
+        mutex_lock(&blkfront_mutex);
+
+        list_for_each_entry(info, &info_list, info_list) {
+                if (info->feature_persistent) {
+                        need_schedule_work = true;
+                        mutex_lock(&info->mutex);
+                        purge_persistent_grants(info);
+                        mutex_unlock(&info->mutex);
+                }
+        }
+
+        if (need_schedule_work)
+                schedule_delayed_work(&blkfront_work, HZ * 10);
+
+        mutex_unlock(&blkfront_mutex);
+}
+
 static int __init xlblk_init(void)
 {
         int ret;
@@ -2626,6 +2708,15 @@ static int __init xlblk_init(void)
         if (!xen_domain())
                 return -ENODEV;
 
+        if (!xen_has_pv_disk_devices())
+                return -ENODEV;
+
+        if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) {
+                pr_warn("xen_blk: can't get major %d with name %s\n",
+                        XENVBD_MAJOR, DEV_NAME);
+                return -ENODEV;
+        }
+
         if (xen_blkif_max_segments < BLKIF_MAX_SEGMENTS_PER_REQUEST)
                 xen_blkif_max_segments = BLKIF_MAX_SEGMENTS_PER_REQUEST;
 
@@ -2641,14 +2732,7 @@ static int __init xlblk_init(void)
                 xen_blkif_max_queues = nr_cpus;
         }
 
-        if (!xen_has_pv_disk_devices())
-                return -ENODEV;
-
-        if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) {
-                printk(KERN_WARNING "xen_blk: can't get major %d with name %s\n",
-                       XENVBD_MAJOR, DEV_NAME);
-                return -ENODEV;
-        }
+        INIT_DELAYED_WORK(&blkfront_work, blkfront_delay_work);
 
         ret = xenbus_register_frontend(&blkfront_driver);
         if (ret) {
@@ -2663,6 +2747,8 @@ module_init(xlblk_init);
 
 static void __exit xlblk_exit(void)
 {
+        cancel_delayed_work_sync(&blkfront_work);
+
         xenbus_unregister_driver(&blkfront_driver);
         unregister_blkdev(XENVBD_MAJOR, DEV_NAME);
         kfree(minors);
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index c9bac9dc4637..e4fe954e63a9 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -498,32 +498,29 @@ static int sysc_check_registers(struct sysc *ddata)
 
 /**
  * syc_ioremap - ioremap register space for the interconnect target module
- * @ddata: deviec driver data
+ * @ddata: device driver data
  *
  * Note that the interconnect target module registers can be anywhere
- * within the first child device address space. For example, SGX has
- * them at offset 0x1fc00 in the 32MB module address space. We just
- * what we need around the interconnect target module registers.
+ * within the interconnect target module range. For example, SGX has
+ * them at offset 0x1fc00 in the 32MB module address space. And cpsw
+ * has them at offset 0x1200 in the CPSW_WR child. Usually the
+ * the interconnect target module registers are at the beginning of
+ * the module range though.
  */
 static int sysc_ioremap(struct sysc *ddata)
 {
-        u32 size = 0;
-
-        if (ddata->offsets[SYSC_SYSSTATUS] >= 0)
-                size = ddata->offsets[SYSC_SYSSTATUS];
-        else if (ddata->offsets[SYSC_SYSCONFIG] >= 0)
-                size = ddata->offsets[SYSC_SYSCONFIG];
-        else if (ddata->offsets[SYSC_REVISION] >= 0)
-                size = ddata->offsets[SYSC_REVISION];
-        else
-                return -EINVAL;
+        int size;
 
-        size &= 0xfff00;
-        size += SZ_256;
+        size = max3(ddata->offsets[SYSC_REVISION],
+                    ddata->offsets[SYSC_SYSCONFIG],
+                    ddata->offsets[SYSC_SYSSTATUS]);
+
+        if (size < 0 || (size + sizeof(u32)) > ddata->module_size)
+                return -EINVAL;
 
         ddata->module_va = devm_ioremap(ddata->dev,
                                         ddata->module_pa,
-                                        size);
+                                        size + sizeof(u32));
         if (!ddata->module_va)
                 return -EIO;
 
@@ -1224,10 +1221,10 @@ static int sysc_child_suspend_noirq(struct device *dev)
         if (!pm_runtime_status_suspended(dev)) {
                 error = pm_generic_runtime_suspend(dev);
                 if (error) {
-                        dev_err(dev, "%s error at %i: %i\n",
-                                __func__, __LINE__, error);
+                        dev_warn(dev, "%s busy at %i: %i\n",
+                                 __func__, __LINE__, error);
 
-                        return error;
+                        return 0;
                 }
 
                 error = sysc_runtime_suspend(ddata->dev);
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 113fc6edb2b0..a5d5a96479bf 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2546,7 +2546,7 @@ static int cdrom_ioctl_drive_status(struct cdrom_device_info *cdi,
         if (!CDROM_CAN(CDC_SELECT_DISC) ||
             (arg == CDSL_CURRENT || arg == CDSL_NONE))
                 return cdi->ops->drive_status(cdi, CDSL_CURRENT);
-        if (((int)arg >= cdi->capacity))
+        if (arg >= cdi->capacity)
                 return -EINVAL;
         return cdrom_slot_status(cdi, arg);
 }
diff --git a/drivers/clk/clk-npcm7xx.c b/drivers/clk/clk-npcm7xx.c
index 740af90a9508..c5edf8f2fd19 100644
--- a/drivers/clk/clk-npcm7xx.c
+++ b/drivers/clk/clk-npcm7xx.c
@@ -558,8 +558,8 @@ static void __init npcm7xx_clk_init(struct device_node *clk_np)
         if (!clk_base)
                 goto npcm7xx_init_error;
 
-        npcm7xx_clk_data = kzalloc(sizeof(*npcm7xx_clk_data->hws) *
-                NPCM7XX_NUM_CLOCKS + sizeof(npcm7xx_clk_data), GFP_KERNEL);
+        npcm7xx_clk_data = kzalloc(struct_size(npcm7xx_clk_data, hws,
+                                   NPCM7XX_NUM_CLOCKS), GFP_KERNEL);
         if (!npcm7xx_clk_data)
                 goto npcm7xx_init_np_err;
 
diff --git a/drivers/clk/x86/clk-st.c b/drivers/clk/x86/clk-st.c
index fb62f3938008..3a0996f2d556 100644
--- a/drivers/clk/x86/clk-st.c
+++ b/drivers/clk/x86/clk-st.c
@@ -46,7 +46,7 @@ static int st_clk_probe(struct platform_device *pdev)
                 clk_oscout1_parents, ARRAY_SIZE(clk_oscout1_parents),
                 0, st_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, NULL);
 
-        clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_25M]->clk);
+        clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk);
 
         hws[ST_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1", "oscout1_mux",
                 0, st_data->base + MISCCLKCNTL1, OSCCLKENB,
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 110483f0e3fb..e26a40971b26 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -379,9 +379,20 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
                 if (idx == -1)
                         idx = i; /* first enabled state */
                 if (s->target_residency > data->predicted_us) {
-                        if (!tick_nohz_tick_stopped())
+                        if (data->predicted_us < TICK_USEC)
                                 break;
 
+                        if (!tick_nohz_tick_stopped()) {
+                                /*
+                                 * If the state selected so far is shallow,
+                                 * waking up early won't hurt, so retain the
+                                 * tick in that case and let the governor run
+                                 * again in the next iteration of the loop.
+                                 */
+                                expected_interval = drv->states[idx].target_residency;
+                                break;
+                        }
+
                         /*
                          * If the state selected so far is shallow and this
                          * state's target residency matches the time till the
diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c
index 6e61cc93c2b0..d7aa7d7ff102 100644
--- a/drivers/crypto/caam/caamalg_qi.c
+++ b/drivers/crypto/caam/caamalg_qi.c
@@ -679,10 +679,8 @@ static int xts_ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,
         int ret = 0;
 
         if (keylen != 2 * AES_MIN_KEY_SIZE  && keylen != 2 * AES_MAX_KEY_SIZE) {
-                crypto_ablkcipher_set_flags(ablkcipher,
-                                            CRYPTO_TFM_RES_BAD_KEY_LEN);
                 dev_err(jrdev, "key size mismatch\n");
-                return -EINVAL;
+                goto badkey;
         }
 
         ctx->cdata.keylen = keylen;
@@ -715,7 +713,7 @@ static int xts_ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher,
         return ret;
 badkey:
         crypto_ablkcipher_set_flags(ablkcipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
-        return 0;
+        return -EINVAL;
 }
 
 /*
diff --git a/drivers/crypto/caam/caampkc.c b/drivers/crypto/caam/caampkc.c
index 578ea63a3109..f26d62e5533a 100644
--- a/drivers/crypto/caam/caampkc.c
+++ b/drivers/crypto/caam/caampkc.c
@@ -71,8 +71,8 @@ static void rsa_priv_f2_unmap(struct device *dev, struct rsa_edesc *edesc,
         dma_unmap_single(dev, pdb->d_dma, key->d_sz, DMA_TO_DEVICE);
         dma_unmap_single(dev, pdb->p_dma, p_sz, DMA_TO_DEVICE);
         dma_unmap_single(dev, pdb->q_dma, q_sz, DMA_TO_DEVICE);
-        dma_unmap_single(dev, pdb->tmp1_dma, p_sz, DMA_TO_DEVICE);
-        dma_unmap_single(dev, pdb->tmp2_dma, q_sz, DMA_TO_DEVICE);
+        dma_unmap_single(dev, pdb->tmp1_dma, p_sz, DMA_BIDIRECTIONAL);
+        dma_unmap_single(dev, pdb->tmp2_dma, q_sz, DMA_BIDIRECTIONAL);
 }
 
 static void rsa_priv_f3_unmap(struct device *dev, struct rsa_edesc *edesc,
@@ -90,8 +90,8 @@ static void rsa_priv_f3_unmap(struct device *dev, struct rsa_edesc *edesc,
         dma_unmap_single(dev, pdb->dp_dma, p_sz, DMA_TO_DEVICE);
         dma_unmap_single(dev, pdb->dq_dma, q_sz, DMA_TO_DEVICE);
         dma_unmap_single(dev, pdb->c_dma, p_sz, DMA_TO_DEVICE);
-        dma_unmap_single(dev, pdb->tmp1_dma, p_sz, DMA_TO_DEVICE);
-        dma_unmap_single(dev, pdb->tmp2_dma, q_sz, DMA_TO_DEVICE);
+        dma_unmap_single(dev, pdb->tmp1_dma, p_sz, DMA_BIDIRECTIONAL);
+        dma_unmap_single(dev, pdb->tmp2_dma, q_sz, DMA_BIDIRECTIONAL);
 }
 
 /* RSA Job Completion handler */
@@ -417,13 +417,13 @@ static int set_rsa_priv_f2_pdb(struct akcipher_request *req,
                 goto unmap_p;
         }
 
-        pdb->tmp1_dma = dma_map_single(dev, key->tmp1, p_sz, DMA_TO_DEVICE);
+        pdb->tmp1_dma = dma_map_single(dev, key->tmp1, p_sz, DMA_BIDIRECTIONAL);
         if (dma_mapping_error(dev, pdb->tmp1_dma)) {
                 dev_err(dev, "Unable to map RSA tmp1 memory\n");
                 goto unmap_q;
         }
 
-        pdb->tmp2_dma = dma_map_single(dev, key->tmp2, q_sz, DMA_TO_DEVICE);
+        pdb->tmp2_dma = dma_map_single(dev, key->tmp2, q_sz, DMA_BIDIRECTIONAL);
         if (dma_mapping_error(dev, pdb->tmp2_dma)) {
                 dev_err(dev, "Unable to map RSA tmp2 memory\n");
                 goto unmap_tmp1;
@@ -451,7 +451,7 @@ static int set_rsa_priv_f2_pdb(struct akcipher_request *req,
         return 0;
 
 unmap_tmp1:
-        dma_unmap_single(dev, pdb->tmp1_dma, p_sz, DMA_TO_DEVICE);
+        dma_unmap_single(dev, pdb->tmp1_dma, p_sz, DMA_BIDIRECTIONAL);
 unmap_q:
         dma_unmap_single(dev, pdb->q_dma, q_sz, DMA_TO_DEVICE);
 unmap_p:
@@ -504,13 +504,13 @@ static int set_rsa_priv_f3_pdb(struct akcipher_request *req,
                 goto unmap_dq;
         }
 
-        pdb->tmp1_dma = dma_map_single(dev, key->tmp1, p_sz, DMA_TO_DEVICE);
+        pdb->tmp1_dma = dma_map_single(dev, key->tmp1, p_sz, DMA_BIDIRECTIONAL);
         if (dma_mapping_error(dev, pdb->tmp1_dma)) {
                 dev_err(dev, "Unable to map RSA tmp1 memory\n");
                 goto unmap_qinv;
         }
 
-        pdb->tmp2_dma = dma_map_single(dev, key->tmp2, q_sz, DMA_TO_DEVICE);
+        pdb->tmp2_dma = dma_map_single(dev, key->tmp2, q_sz, DMA_BIDIRECTIONAL);
         if (dma_mapping_error(dev, pdb->tmp2_dma)) {
                 dev_err(dev, "Unable to map RSA tmp2 memory\n");
                 goto unmap_tmp1;
@@ -538,7 +538,7 @@ static int set_rsa_priv_f3_pdb(struct akcipher_request *req,
         return 0;
 
 unmap_tmp1:
-        dma_unmap_single(dev, pdb->tmp1_dma, p_sz, DMA_TO_DEVICE);
+        dma_unmap_single(dev, pdb->tmp1_dma, p_sz, DMA_BIDIRECTIONAL);
 unmap_qinv:
         dma_unmap_single(dev, pdb->c_dma, p_sz, DMA_TO_DEVICE);
 unmap_dq:
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index f4f258075b89..acdd72016ffe 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -190,7 +190,8 @@ static void caam_jr_dequeue(unsigned long devarg)
                 BUG_ON(CIRC_CNT(head, tail + i, JOBR_DEPTH) <= 0);
 
                 /* Unmap just-run descriptor so we can post-process */
-                dma_unmap_single(dev, jrp->outring[hw_idx].desc,
+                dma_unmap_single(dev,
+                                 caam_dma_to_cpu(jrp->outring[hw_idx].desc),
                                  jrp->entinfo[sw_idx].desc_size,
                                  DMA_TO_DEVICE);
 
diff --git a/drivers/crypto/cavium/nitrox/nitrox_dev.h b/drivers/crypto/cavium/nitrox/nitrox_dev.h
index 9a476bb6d4c7..af596455b420 100644
--- a/drivers/crypto/cavium/nitrox/nitrox_dev.h
+++ b/drivers/crypto/cavium/nitrox/nitrox_dev.h
@@ -35,6 +35,7 @@ struct nitrox_cmdq {
         /* requests in backlog queues */
         atomic_t backlog_count;
 
+        int write_idx;
         /* command size 32B/64B */
         u8 instr_size;
         u8 qno;
@@ -87,7 +88,7 @@ struct nitrox_bh {
         struct bh_data *slc;
 };
 
-/* NITROX-5 driver state */
+/* NITROX-V driver state */
 #define NITROX_UCODE_LOADED     0
 #define NITROX_READY            1
 
diff --git a/drivers/crypto/cavium/nitrox/nitrox_lib.c b/drivers/crypto/cavium/nitrox/nitrox_lib.c
index ebe267379ac9..4d31df07777f 100644
--- a/drivers/crypto/cavium/nitrox/nitrox_lib.c
+++ b/drivers/crypto/cavium/nitrox/nitrox_lib.c
@@ -36,6 +36,7 @@ static int cmdq_common_init(struct nitrox_cmdq *cmdq)
         cmdq->head = PTR_ALIGN(cmdq->head_unaligned, PKT_IN_ALIGN);
         cmdq->dma = PTR_ALIGN(cmdq->dma_unaligned, PKT_IN_ALIGN);
         cmdq->qsize = (qsize + PKT_IN_ALIGN);
+        cmdq->write_idx = 0;
 
         spin_lock_init(&cmdq->response_lock);
         spin_lock_init(&cmdq->cmdq_lock);
diff --git a/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c b/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c
index deaefd532aaa..4a362fc22f62 100644
--- a/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c
+++ b/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c
@@ -42,6 +42,16 @@
  *   Invalid flag options in AES-CCM IV.
  */
 
+static inline int incr_index(int index, int count, int max)
+{
+        if ((index + count) >= max)
+                index = index + count - max;
+        else
+                index += count;
+
+        return index;
+}
+
 /**
  * dma_free_sglist - unmap and free the sg lists.
  * @ndev: N5 device
@@ -426,30 +436,29 @@ static void post_se_instr(struct nitrox_softreq *sr,
                           struct nitrox_cmdq *cmdq)
 {
         struct nitrox_device *ndev = sr->ndev;
-        union nps_pkt_in_instr_baoff_dbell pkt_in_baoff_dbell;
-        u64 offset;
+        int idx;
         u8 *ent;
 
         spin_lock_bh(&cmdq->cmdq_lock);
 
-        /* get the next write offset */
-        offset = NPS_PKT_IN_INSTR_BAOFF_DBELLX(cmdq->qno);
-        pkt_in_baoff_dbell.value = nitrox_read_csr(ndev, offset);
+        idx = cmdq->write_idx;
         /* copy the instruction */
-        ent = cmdq->head + pkt_in_baoff_dbell.s.aoff;
+        ent = cmdq->head + (idx * cmdq->instr_size);
         memcpy(ent, &sr->instr, cmdq->instr_size);
-        /* flush the command queue updates */
-        dma_wmb();
 
-        sr->tstamp = jiffies;
         atomic_set(&sr->status, REQ_POSTED);
         response_list_add(sr, cmdq);
+        sr->tstamp = jiffies;
+        /* flush the command queue updates */
+        dma_wmb();
 
         /* Ring doorbell with count 1 */
         writeq(1, cmdq->dbell_csr_addr);
         /* orders the doorbell rings */
         mmiowb();
 
+        cmdq->write_idx = incr_index(idx, 1, ndev->qlen);
+
         spin_unlock_bh(&cmdq->cmdq_lock);
 }
 
@@ -459,6 +468,9 @@ static int post_backlog_cmds(struct nitrox_cmdq *cmdq)
         struct nitrox_softreq *sr, *tmp;
         int ret = 0;
 
+        if (!atomic_read(&cmdq->backlog_count))
+                return 0;
+
         spin_lock_bh(&cmdq->backlog_lock);
 
         list_for_each_entry_safe(sr, tmp, &cmdq->backlog_head, backlog) {
@@ -466,7 +478,7 @@ static int post_backlog_cmds(struct nitrox_cmdq *cmdq)
 
                 /* submit until space available */
                 if (unlikely(cmdq_full(cmdq, ndev->qlen))) {
-                        ret = -EBUSY;
+                        ret = -ENOSPC;
                         break;
                 }
                 /* delete from backlog list */
@@ -491,23 +503,20 @@ static int nitrox_enqueue_request(struct nitrox_softreq *sr)
 {
         struct nitrox_cmdq *cmdq = sr->cmdq;
         struct nitrox_device *ndev = sr->ndev;
-        int ret = -EBUSY;
+
+        /* try to post backlog requests */
+        post_backlog_cmds(cmdq);
 
         if (unlikely(cmdq_full(cmdq, ndev->qlen))) {
                 if (!(sr->flags & CRYPTO_TFM_REQ_MAY_BACKLOG))
-                        return -EAGAIN;
-
+                        return -ENOSPC;
+                /* add to backlog list */
                 backlog_list_add(sr, cmdq);
-        } else {
-                ret = post_backlog_cmds(cmdq);
-                if (ret) {
-                        backlog_list_add(sr, cmdq);
-                        return ret;
-                }
-                post_se_instr(sr, cmdq);
-                ret = -EINPROGRESS;
+                return -EBUSY;
         }
-        return ret;
+        post_se_instr(sr, cmdq);
+
+        return -EINPROGRESS;
 }
 
 /**
@@ -624,11 +633,9 @@ int nitrox_process_se_request(struct nitrox_device *ndev,
          */
         sr->instr.fdata[0] = *((u64 *)&req->gph);
         sr->instr.fdata[1] = 0;
-        /* flush the soft_req changes before posting the cmd */
-        wmb();
 
         ret = nitrox_enqueue_request(sr);
-        if (ret == -EAGAIN)
+        if (ret == -ENOSPC)
                 goto send_fail;
 
         return ret;
diff --git a/drivers/crypto/chelsio/chtls/chtls.h b/drivers/crypto/chelsio/chtls/chtls.h
index a53a0e6ba024..7725b6ee14ef 100644
--- a/drivers/crypto/chelsio/chtls/chtls.h
+++ b/drivers/crypto/chelsio/chtls/chtls.h
@@ -96,6 +96,10 @@ enum csk_flags {
         CSK_CONN_INLINE,        /* Connection on HW */
 };
 
+enum chtls_cdev_state {
+        CHTLS_CDEV_STATE_UP = 1
+};
+
 struct listen_ctx {
         struct sock *lsk;
         struct chtls_dev *cdev;
@@ -146,6 +150,7 @@ struct chtls_dev {
         unsigned int send_page_order;
         int max_host_sndbuf;
         struct key_map kmap;
+        unsigned int cdev_state;
 };
 
 struct chtls_hws {
diff --git a/drivers/crypto/chelsio/chtls/chtls_main.c b/drivers/crypto/chelsio/chtls/chtls_main.c
index 9b07f9165658..f59b044ebd25 100644
--- a/drivers/crypto/chelsio/chtls/chtls_main.c
+++ b/drivers/crypto/chelsio/chtls/chtls_main.c
@@ -160,6 +160,7 @@ static void chtls_register_dev(struct chtls_dev *cdev)
         tlsdev->hash = chtls_create_hash;
         tlsdev->unhash = chtls_destroy_hash;
         tls_register_device(&cdev->tlsdev);
+        cdev->cdev_state = CHTLS_CDEV_STATE_UP;
 }
 
 static void chtls_unregister_dev(struct chtls_dev *cdev)
@@ -281,8 +282,10 @@ static void chtls_free_all_uld(void)
         struct chtls_dev *cdev, *tmp;
 
         mutex_lock(&cdev_mutex);
-        list_for_each_entry_safe(cdev, tmp, &cdev_list, list)
-                chtls_free_uld(cdev);
+        list_for_each_entry_safe(cdev, tmp, &cdev_list, list) {
+                if (cdev->cdev_state == CHTLS_CDEV_STATE_UP)
+                        chtls_free_uld(cdev);
+        }
         mutex_unlock(&cdev_mutex);
 }
 
diff --git a/drivers/crypto/vmx/aes_cbc.c b/drivers/crypto/vmx/aes_cbc.c
index 5285ece4f33a..b71895871be3 100644
--- a/drivers/crypto/vmx/aes_cbc.c
+++ b/drivers/crypto/vmx/aes_cbc.c
@@ -107,24 +107,23 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc,
                 ret = crypto_skcipher_encrypt(req);
                 skcipher_request_zero(req);
         } else {
-                preempt_disable();
-                pagefault_disable();
-                enable_kernel_vsx();
-
                 blkcipher_walk_init(&walk, dst, src, nbytes);
                 ret = blkcipher_walk_virt(desc, &walk);
                 while ((nbytes = walk.nbytes)) {
+                        preempt_disable();
+                        pagefault_disable();
+                        enable_kernel_vsx();
                         aes_p8_cbc_encrypt(walk.src.virt.addr,
                                            walk.dst.virt.addr,
                                            nbytes & AES_BLOCK_MASK,
                                            &ctx->enc_key, walk.iv, 1);
+                        disable_kernel_vsx();
+                        pagefault_enable();
+                        preempt_enable();
+
                         nbytes &= AES_BLOCK_SIZE - 1;
                         ret = blkcipher_walk_done(desc, &walk, nbytes);
                 }
-
-                disable_kernel_vsx();
-                pagefault_enable();
-                preempt_enable();
         }
 
         return ret;
@@ -147,24 +146,23 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc,
                 ret = crypto_skcipher_decrypt(req);
                 skcipher_request_zero(req);
         } else {
-                preempt_disable();
-                pagefault_disable();
-                enable_kernel_vsx();
-
                 blkcipher_walk_init(&walk, dst, src, nbytes);
                 ret = blkcipher_walk_virt(desc, &walk);
                 while ((nbytes = walk.nbytes)) {
+                        preempt_disable();
+                        pagefault_disable();
+                        enable_kernel_vsx();
                         aes_p8_cbc_encrypt(walk.src.virt.addr,
                                            walk.dst.virt.addr,
                                            nbytes & AES_BLOCK_MASK,
                                            &ctx->dec_key, walk.iv, 0);
+                        disable_kernel_vsx();
+                        pagefault_enable();
+                        preempt_enable();
+
                         nbytes &= AES_BLOCK_SIZE - 1;
                         ret = blkcipher_walk_done(desc, &walk, nbytes);
                 }
-
-                disable_kernel_vsx();
-                pagefault_enable();
-                preempt_enable();
         }
 
         return ret;
diff --git a/drivers/crypto/vmx/aes_xts.c b/drivers/crypto/vmx/aes_xts.c
index 8bd9aff0f55f..e9954a7d4694 100644
--- a/drivers/crypto/vmx/aes_xts.c
+++ b/drivers/crypto/vmx/aes_xts.c
@@ -116,32 +116,39 @@ static int p8_aes_xts_crypt(struct blkcipher_desc *desc,
                 ret = enc? crypto_skcipher_encrypt(req) : crypto_skcipher_decrypt(req);
                 skcipher_request_zero(req);
         } else {
+                blkcipher_walk_init(&walk, dst, src, nbytes);
+
+                ret = blkcipher_walk_virt(desc, &walk);
+
                 preempt_disable();
                 pagefault_disable();
                 enable_kernel_vsx();
 
-                blkcipher_walk_init(&walk, dst, src, nbytes);
-
-                ret = blkcipher_walk_virt(desc, &walk);
                 iv = walk.iv;
                 memset(tweak, 0, AES_BLOCK_SIZE);
                 aes_p8_encrypt(iv, tweak, &ctx->tweak_key);
 
+                disable_kernel_vsx();
+                pagefault_enable();
+                preempt_enable();
+
                 while ((nbytes = walk.nbytes)) {
+                        preempt_disable();
+                        pagefault_disable();
+                        enable_kernel_vsx();
                         if (enc)
                                 aes_p8_xts_encrypt(walk.src.virt.addr, walk.dst.virt.addr,
                                                 nbytes & AES_BLOCK_MASK, &ctx->enc_key, NULL, tweak);
                         else
                                 aes_p8_xts_decrypt(walk.src.virt.addr, walk.dst.virt.addr,
                                                 nbytes & AES_BLOCK_MASK, &ctx->dec_key, NULL, tweak);
+                        disable_kernel_vsx();
+                        pagefault_enable();
+                        preempt_enable();
 
                         nbytes &= AES_BLOCK_SIZE - 1;
                         ret = blkcipher_walk_done(desc, &walk, nbytes);
                 }
-
-                disable_kernel_vsx();
-                pagefault_enable();
-                preempt_enable();
         }
         return ret;
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 502b94fb116a..b6e9df11115d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1012,13 +1012,9 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev,
                 if (r)
                         return r;
 
-                if (chunk_ib->flags & AMDGPU_IB_FLAG_PREAMBLE) {
-                        parser->job->preamble_status |= AMDGPU_PREAMBLE_IB_PRESENT;
-                        if (!parser->ctx->preamble_presented) {
-                                parser->job->preamble_status |= AMDGPU_PREAMBLE_IB_PRESENT_FIRST;
-                                parser->ctx->preamble_presented = true;
-                        }
-                }
+                if (chunk_ib->flags & AMDGPU_IB_FLAG_PREAMBLE)
+                        parser->job->preamble_status |=
+                                AMDGPU_PREAMBLE_IB_PRESENT;
 
                 if (parser->ring && parser->ring != ring)
                         return -EINVAL;
@@ -1207,26 +1203,24 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
 
         int r;
 
+        job = p->job;
+        p->job = NULL;
+
+        r = drm_sched_job_init(&job->base, entity, p->filp);
+        if (r)
+                goto error_unlock;
+
+        /* No memory allocation is allowed while holding the mn lock */
         amdgpu_mn_lock(p->mn);
         amdgpu_bo_list_for_each_userptr_entry(e, p->bo_list) {
                 struct amdgpu_bo *bo = e->robj;
 
                 if (amdgpu_ttm_tt_userptr_needs_pages(bo->tbo.ttm)) {
-                        amdgpu_mn_unlock(p->mn);
-                        return -ERESTARTSYS;
+                        r = -ERESTARTSYS;
+                        goto error_abort;
                 }
         }
 
-        job = p->job;
-        p->job = NULL;
-
-        r = drm_sched_job_init(&job->base, entity, p->filp);
-        if (r) {
-                amdgpu_job_free(job);
-                amdgpu_mn_unlock(p->mn);
-                return r;
-        }
-
         job->owner = p->filp;
         p->fence = dma_fence_get(&job->base.s_fence->finished);
 
@@ -1241,6 +1235,12 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
 
         amdgpu_cs_post_dependencies(p);
 
+        if ((job->preamble_status & AMDGPU_PREAMBLE_IB_PRESENT) &&
+            !p->ctx->preamble_presented) {
+                job->preamble_status |= AMDGPU_PREAMBLE_IB_PRESENT_FIRST;
+                p->ctx->preamble_presented = true;
+        }
+
         cs->out.handle = seq;
         job->uf_sequence = seq;
 
@@ -1258,6 +1258,15 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
         amdgpu_mn_unlock(p->mn);
 
         return 0;
+
+error_abort:
+        dma_fence_put(&job->base.s_fence->finished);
+        job->base.s_fence = NULL;
+
+error_unlock:
+        amdgpu_job_free(job);
+        amdgpu_mn_unlock(p->mn);
+        return r;
 }
 
 int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 5518e623fed2..51b5e977ca88 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -164,8 +164,10 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
                 return r;
         }
 
+        need_ctx_switch = ring->current_ctx != fence_ctx;
         if (ring->funcs->emit_pipeline_sync && job &&
             ((tmp = amdgpu_sync_get_fence(&job->sched_sync, NULL)) ||
+             (amdgpu_sriov_vf(adev) && need_ctx_switch) ||
              amdgpu_vm_need_pipeline_sync(ring, job))) {
                 need_pipe_sync = true;
                 dma_fence_put(tmp);
@@ -196,7 +198,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
         }
 
         skip_preamble = ring->current_ctx == fence_ctx;
-        need_ctx_switch = ring->current_ctx != fence_ctx;
         if (job && ring->funcs->emit_cntxcntl) {
                 if (need_ctx_switch)
                         status |= AMDGPU_HAVE_CTX_SWITCH;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index 8f98629fbe59..7b4e657a95c7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -1932,14 +1932,6 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)
                         amdgpu_fence_wait_empty(ring);
         }
 
-        mutex_lock(&adev->pm.mutex);
-        /* update battery/ac status */
-        if (power_supply_is_system_supplied() > 0)
-                adev->pm.ac_power = true;
-        else
-                adev->pm.ac_power = false;
-        mutex_unlock(&adev->pm.mutex);
-
         if (adev->powerplay.pp_funcs->dispatch_tasks) {
                 if (!amdgpu_device_has_dc_support(adev)) {
                         mutex_lock(&adev->pm.mutex);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index ece0ac703e27..b17771dd5ce7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -172,6 +172,7 @@ static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,
          * is validated on next vm use to avoid fault.
          * */
         list_move_tail(&base->vm_status, &vm->evicted);
+        base->moved = true;
 }
 
 /**
@@ -369,7 +370,6 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
         uint64_t addr;
         int r;
 
-        addr = amdgpu_bo_gpu_offset(bo);
         entries = amdgpu_bo_size(bo) / 8;
 
         if (pte_support_ats) {
@@ -401,6 +401,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
         if (r)
                 goto error;
 
+        addr = amdgpu_bo_gpu_offset(bo);
         if (ats_entries) {
                 uint64_t ats_value;
 
@@ -2483,28 +2484,52 @@ static uint32_t amdgpu_vm_get_block_size(uint64_t vm_size)
  * amdgpu_vm_adjust_size - adjust vm size, block size and fragment size
  *
  * @adev: amdgpu_device pointer
- * @vm_size: the default vm size if it's set auto
+ * @min_vm_size: the minimum vm size in GB if it's set auto
  * @fragment_size_default: Default PTE fragment size
  * @max_level: max VMPT level
  * @max_bits: max address space size in bits
  *
  */
-void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size,
+void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t min_vm_size,
                            uint32_t fragment_size_default, unsigned max_level,
                            unsigned max_bits)
 {
+        unsigned int max_size = 1 << (max_bits - 30);
+        unsigned int vm_size;
         uint64_t tmp;
 
         /* adjust vm size first */
         if (amdgpu_vm_size != -1) {
-                unsigned max_size = 1 << (max_bits - 30);
-
                 vm_size = amdgpu_vm_size;
                 if (vm_size > max_size) {
                         dev_warn(adev->dev, "VM size (%d) too large, max is %u GB\n",
                                  amdgpu_vm_size, max_size);
                         vm_size = max_size;
                 }
+        } else {
+                struct sysinfo si;
+                unsigned int phys_ram_gb;
+
+                /* Optimal VM size depends on the amount of physical
+                 * RAM available. Underlying requirements and
+                 * assumptions:
+                 *
+                 *  - Need to map system memory and VRAM from all GPUs
+                 *     - VRAM from other GPUs not known here
+                 *     - Assume VRAM <= system memory
+                 *  - On GFX8 and older, VM space can be segmented for
+                 *    different MTYPEs
+                 *  - Need to allow room for fragmentation, guard pages etc.
+                 *
+                 * This adds up to a rough guess of system memory x3.
+                 * Round up to power of two to maximize the available
+                 * VM size with the given page table size.
+                 */
+                si_meminfo(&si);
+                phys_ram_gb = ((uint64_t)si.totalram * si.mem_unit +
+                               (1 << 30) - 1) >> 30;
+                vm_size = roundup_pow_of_two(
+                        min(max(phys_ram_gb * 3, min_vm_size), max_size));
         }
 
         adev->vm_manager.max_pfn = (uint64_t)vm_size << 18;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
index 67a15d439ac0..9fa9df0c5e7f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
@@ -321,7 +321,7 @@ struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping(struct amdgpu_vm *vm,
 void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket);
 void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
                       struct amdgpu_bo_va *bo_va);
-void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size,
+void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t min_vm_size,
                            uint32_t fragment_size_default, unsigned max_level,
                            unsigned max_bits);
 int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp);
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 5cd45210113f..5a9534a82d40 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -5664,6 +5664,11 @@ static int gfx_v8_0_set_powergating_state(void *handle,
         if (amdgpu_sriov_vf(adev))
                 return 0;
 
+        if (adev->pg_flags & (AMD_PG_SUPPORT_GFX_SMG |
+                                AMD_PG_SUPPORT_RLC_SMU_HS |
+                                AMD_PG_SUPPORT_CP |
+                                AMD_PG_SUPPORT_GFX_DMG))
+                adev->gfx.rlc.funcs->enter_safe_mode(adev);
         switch (adev->asic_type) {
         case CHIP_CARRIZO:
         case CHIP_STONEY:
@@ -5713,7 +5718,11 @@ static int gfx_v8_0_set_powergating_state(void *handle,
         default:
                 break;
         }
-
+        if (adev->pg_flags & (AMD_PG_SUPPORT_GFX_SMG |
+                                AMD_PG_SUPPORT_RLC_SMU_HS |
+                                AMD_PG_SUPPORT_CP |
+                                AMD_PG_SUPPORT_GFX_DMG))
+                adev->gfx.rlc.funcs->exit_safe_mode(adev);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index 75317f283c69..ad151fefa41f 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@ -632,12 +632,6 @@ static void gmc_v6_0_gart_disable(struct amdgpu_device *adev)
         amdgpu_gart_table_vram_unpin(adev);
 }
 
-static void gmc_v6_0_gart_fini(struct amdgpu_device *adev)
-{
-        amdgpu_gart_table_vram_free(adev);
-        amdgpu_gart_fini(adev);
-}
-
 static void gmc_v6_0_vm_decode_fault(struct amdgpu_device *adev,
                                      u32 status, u32 addr, u32 mc_client)
 {
@@ -935,8 +929,9 @@ static int gmc_v6_0_sw_fini(void *handle)
 
         amdgpu_gem_force_release(adev);
         amdgpu_vm_manager_fini(adev);
-        gmc_v6_0_gart_fini(adev);
+        amdgpu_gart_table_vram_free(adev);
         amdgpu_bo_fini(adev);
+        amdgpu_gart_fini(adev);
         release_firmware(adev->gmc.fw);
         adev->gmc.fw = NULL;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index 36dc367c4b45..f8d8a3a73e42 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -747,19 +747,6 @@ static void gmc_v7_0_gart_disable(struct amdgpu_device *adev)
 }
 
 /**
- * gmc_v7_0_gart_fini - vm fini callback
- *
- * @adev: amdgpu_device pointer
- *
- * Tears down the driver GART/VM setup (CIK).
- */
-static void gmc_v7_0_gart_fini(struct amdgpu_device *adev)
-{
-        amdgpu_gart_table_vram_free(adev);
-        amdgpu_gart_fini(adev);
-}
-
-/**
  * gmc_v7_0_vm_decode_fault - print human readable fault info
  *
  * @adev: amdgpu_device pointer
@@ -1095,8 +1082,9 @@ static int gmc_v7_0_sw_fini(void *handle)
         amdgpu_gem_force_release(adev);
         amdgpu_vm_manager_fini(adev);
         kfree(adev->gmc.vm_fault_info);
-        gmc_v7_0_gart_fini(adev);
+        amdgpu_gart_table_vram_free(adev);
         amdgpu_bo_fini(adev);
+        amdgpu_gart_fini(adev);
         release_firmware(adev->gmc.fw);
         adev->gmc.fw = NULL;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index 70fc97b59b4f..9333109b210d 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -969,19 +969,6 @@ static void gmc_v8_0_gart_disable(struct amdgpu_device *adev)
 }
 
 /**
- * gmc_v8_0_gart_fini - vm fini callback
- *
- * @adev: amdgpu_device pointer
- *
- * Tears down the driver GART/VM setup (CIK).
- */
-static void gmc_v8_0_gart_fini(struct amdgpu_device *adev)
-{
-        amdgpu_gart_table_vram_free(adev);
-        amdgpu_gart_fini(adev);
-}
-
-/**
  * gmc_v8_0_vm_decode_fault - print human readable fault info
  *
  * @adev: amdgpu_device pointer
@@ -1199,8 +1186,9 @@ static int gmc_v8_0_sw_fini(void *handle)
         amdgpu_gem_force_release(adev);
         amdgpu_vm_manager_fini(adev);
         kfree(adev->gmc.vm_fault_info);
-        gmc_v8_0_gart_fini(adev);
+        amdgpu_gart_table_vram_free(adev);
         amdgpu_bo_fini(adev);
+        amdgpu_gart_fini(adev);
         release_firmware(adev->gmc.fw);
         adev->gmc.fw = NULL;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 399a5db27649..72f8018fa2a8 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -942,26 +942,12 @@ static int gmc_v9_0_sw_init(void *handle)
         return 0;
 }
 
-/**
- * gmc_v9_0_gart_fini - vm fini callback
- *
- * @adev: amdgpu_device pointer
- *
- * Tears down the driver GART/VM setup (CIK).
- */
-static void gmc_v9_0_gart_fini(struct amdgpu_device *adev)
-{
-        amdgpu_gart_table_vram_free(adev);
-        amdgpu_gart_fini(adev);
-}
-
 static int gmc_v9_0_sw_fini(void *handle)
 {
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
         amdgpu_gem_force_release(adev);
         amdgpu_vm_manager_fini(adev);
-        gmc_v9_0_gart_fini(adev);
 
         /*
         * TODO:
@@ -974,7 +960,9 @@ static int gmc_v9_0_sw_fini(void *handle)
         */
         amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, NULL);
 
+        amdgpu_gart_table_vram_free(adev);
         amdgpu_bo_fini(adev);
+        amdgpu_gart_fini(adev);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
index 3f57f6463dc8..cb79a93c2eb7 100644
--- a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
@@ -65,8 +65,6 @@ static int kv_set_thermal_temperature_range(struct amdgpu_device *adev,
                                             int min_temp, int max_temp);
 static int kv_init_fps_limits(struct amdgpu_device *adev);
 
-static void kv_dpm_powergate_uvd(void *handle, bool gate);
-static void kv_dpm_powergate_vce(struct amdgpu_device *adev, bool gate);
 static void kv_dpm_powergate_samu(struct amdgpu_device *adev, bool gate);
 static void kv_dpm_powergate_acp(struct amdgpu_device *adev, bool gate);
 
@@ -1354,8 +1352,6 @@ static int kv_dpm_enable(struct amdgpu_device *adev)
                 return ret;
         }
 
-        kv_update_current_ps(adev, adev->pm.dpm.boot_ps);
-
         if (adev->irq.installed &&
             amdgpu_is_internal_thermal_sensor(adev->pm.int_thermal_type)) {
                 ret = kv_set_thermal_temperature_range(adev, KV_TEMP_RANGE_MIN, KV_TEMP_RANGE_MAX);
@@ -1374,6 +1370,8 @@ static int kv_dpm_enable(struct amdgpu_device *adev)
 
 static void kv_dpm_disable(struct amdgpu_device *adev)
 {
+        struct kv_power_info *pi = kv_get_pi(adev);
+
         amdgpu_irq_put(adev, &adev->pm.dpm.thermal.irq,
                        AMDGPU_THERMAL_IRQ_LOW_TO_HIGH);
         amdgpu_irq_put(adev, &adev->pm.dpm.thermal.irq,
@@ -1387,8 +1385,10 @@ static void kv_dpm_disable(struct amdgpu_device *adev)
         /* powerup blocks */
         kv_dpm_powergate_acp(adev, false);
         kv_dpm_powergate_samu(adev, false);
-        kv_dpm_powergate_vce(adev, false);
-        kv_dpm_powergate_uvd(adev, false);
+        if (pi->caps_vce_pg) /* power on the VCE block */
+                amdgpu_kv_notify_message_to_smu(adev, PPSMC_MSG_VCEPowerON);
+        if (pi->caps_uvd_pg) /* power on the UVD block */
+                amdgpu_kv_notify_message_to_smu(adev, PPSMC_MSG_UVDPowerON);
 
         kv_enable_smc_cac(adev, false);
         kv_enable_didt(adev, false);
@@ -1551,7 +1551,6 @@ static int kv_update_vce_dpm(struct amdgpu_device *adev,
         int ret;
 
         if (amdgpu_new_state->evclk > 0 && amdgpu_current_state->evclk == 0) {
-                kv_dpm_powergate_vce(adev, false);
                 if (pi->caps_stable_p_state)
                         pi->vce_boot_level = table->count - 1;
                 else
@@ -1573,7 +1572,6 @@ static int kv_update_vce_dpm(struct amdgpu_device *adev,
                 kv_enable_vce_dpm(adev, true);
         } else if (amdgpu_new_state->evclk == 0 && amdgpu_current_state->evclk > 0) {
                 kv_enable_vce_dpm(adev, false);
-                kv_dpm_powergate_vce(adev, true);
         }
 
         return 0;
@@ -1702,24 +1700,32 @@ static void kv_dpm_powergate_uvd(void *handle, bool gate)
         }
 }
 
-static void kv_dpm_powergate_vce(struct amdgpu_device *adev, bool gate)
+static void kv_dpm_powergate_vce(void *handle, bool gate)
 {
+        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
         struct kv_power_info *pi = kv_get_pi(adev);
-
-        if (pi->vce_power_gated == gate)
-                return;
+        int ret;
 
         pi->vce_power_gated = gate;
 
-        if (!pi->caps_vce_pg)
-                return;
-
-        if (gate)
-                amdgpu_kv_notify_message_to_smu(adev, PPSMC_MSG_VCEPowerOFF);
-        else
-                amdgpu_kv_notify_message_to_smu(adev, PPSMC_MSG_VCEPowerON);
+        if (gate) {
+                /* stop the VCE block */
+                ret = amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCE,
+                                                             AMD_PG_STATE_GATE);
+                kv_enable_vce_dpm(adev, false);
+                if (pi->caps_vce_pg) /* power off the VCE block */
+                        amdgpu_kv_notify_message_to_smu(adev, PPSMC_MSG_VCEPowerOFF);
+        } else {
+                if (pi->caps_vce_pg) /* power on the VCE block */
+                        amdgpu_kv_notify_message_to_smu(adev, PPSMC_MSG_VCEPowerON);
+                kv_enable_vce_dpm(adev, true);
+                /* re-init the VCE block */
+                ret = amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCE,
+                                                             AMD_PG_STATE_UNGATE);
+        }
 }
 
+
 static void kv_dpm_powergate_samu(struct amdgpu_device *adev, bool gate)
 {
         struct kv_power_info *pi = kv_get_pi(adev);
@@ -3061,7 +3067,7 @@ static int kv_dpm_hw_init(void *handle)
         else
                 adev->pm.dpm_enabled = true;
         mutex_unlock(&adev->pm.mutex);
-
+        amdgpu_pm_compute_clocks(adev);
         return ret;
 }
 
@@ -3313,6 +3319,9 @@ static int kv_set_powergating_by_smu(void *handle,
         case AMD_IP_BLOCK_TYPE_UVD:
                 kv_dpm_powergate_uvd(handle, gate);
                 break;
+        case AMD_IP_BLOCK_TYPE_VCE:
+                kv_dpm_powergate_vce(handle, gate);
+                break;
         default:
                 break;
         }
diff --git a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
index db327b412562..1de96995e690 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
@@ -6887,7 +6887,6 @@ static int si_dpm_enable(struct amdgpu_device *adev)
 
         si_enable_auto_throttle_source(adev, AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL, true);
         si_thermal_start_thermal_controller(adev);
-        ni_update_current_ps(adev, boot_ps);
 
         return 0;
 }
@@ -7763,7 +7762,7 @@ static int si_dpm_hw_init(void *handle)
         else
                 adev->pm.dpm_enabled = true;
         mutex_unlock(&adev->pm.mutex);
-
+        amdgpu_pm_compute_clocks(adev);
         return ret;
 }
 
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
index fbe878ae1e8c..4ba0003a9d32 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
@@ -480,12 +480,20 @@ void pp_rv_set_display_requirement(struct pp_smu *pp,
 {
         struct dc_context *ctx = pp->ctx;
         struct amdgpu_device *adev = ctx->driver_context;
+        void *pp_handle = adev->powerplay.pp_handle;
         const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
+        struct pp_display_clock_request clock = {0};
 
-        if (!pp_funcs || !pp_funcs->display_configuration_changed)
+        if (!pp_funcs || !pp_funcs->display_clock_voltage_request)
                 return;
 
-        amdgpu_dpm_display_configuration_changed(adev);
+        clock.clock_type = amd_pp_dcf_clock;
+        clock.clock_freq_in_khz = req->hard_min_dcefclk_khz;
+        pp_funcs->display_clock_voltage_request(pp_handle, &clock);
+
+        clock.clock_type = amd_pp_f_clock;
+        clock.clock_freq_in_khz = req->hard_min_fclk_khz;
+        pp_funcs->display_clock_voltage_request(pp_handle, &clock);
 }
 
 void pp_rv_set_wm_ranges(struct pp_smu *pp,
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index 567867915d32..37eaf72ace54 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -754,8 +754,12 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason)
                          * fail-safe mode
                          */
                         if (dc_is_hdmi_signal(link->connector_signal) ||
-                            dc_is_dvi_signal(link->connector_signal))
+                            dc_is_dvi_signal(link->connector_signal)) {
+                                if (prev_sink != NULL)
+                                        dc_sink_release(prev_sink);
+
                                 return false;
+                        }
                 default:
                         break;
                 }
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 11d834f94220..98358b4b36de 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -199,7 +199,6 @@ vma_create(struct drm_i915_gem_object *obj,
                 vma->flags |= I915_VMA_GGTT;
                 list_add(&vma->obj_link, &obj->vma_list);
         } else {
-                i915_ppgtt_get(i915_vm_to_ppgtt(vm));
                 list_add_tail(&vma->obj_link, &obj->vma_list);
         }
 
@@ -807,9 +806,6 @@ static void __i915_vma_destroy(struct i915_vma *vma)
         if (vma->obj)
                 rb_erase(&vma->obj_node, &vma->obj->vma_tree);
 
-        if (!i915_vma_is_ggtt(vma))
-                i915_ppgtt_put(i915_vm_to_ppgtt(vma->vm));
-
         rbtree_postorder_for_each_entry_safe(iter, n, &vma->active, node) {
                 GEM_BUG_ON(i915_gem_active_isset(&iter->base));
                 kfree(iter);
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index b725835b47ef..769f3f586661 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -962,9 +962,6 @@ void i915_audio_component_init(struct drm_i915_private *dev_priv)
 {
         int ret;
 
-        if (INTEL_INFO(dev_priv)->num_pipes == 0)
-                return;
-
         ret = component_add(dev_priv->drm.dev, &i915_audio_component_bind_ops);
         if (ret < 0) {
                 DRM_ERROR("failed to add audio component (%d)\n", ret);
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ed3fa1c8a983..4a3c8ee9a973 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2988,6 +2988,7 @@ static int skl_check_main_surface(const struct intel_crtc_state *crtc_state,
         int w = drm_rect_width(&plane_state->base.src) >> 16;
         int h = drm_rect_height(&plane_state->base.src) >> 16;
         int dst_x = plane_state->base.dst.x1;
+        int dst_w = drm_rect_width(&plane_state->base.dst);
         int pipe_src_w = crtc_state->pipe_src_w;
         int max_width = skl_max_plane_width(fb, 0, rotation);
         int max_height = 4096;
@@ -3009,10 +3010,10 @@ static int skl_check_main_surface(const struct intel_crtc_state *crtc_state,
          * screen may cause FIFO underflow and display corruption.
          */
         if ((IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) &&
-            (dst_x + w < 4 || dst_x > pipe_src_w - 4)) {
+            (dst_x + dst_w < 4 || dst_x > pipe_src_w - 4)) {
                 DRM_DEBUG_KMS("requested plane X %s position %d invalid (valid range %d-%d)\n",
-                              dst_x + w < 4 ? "end" : "start",
-                              dst_x + w < 4 ? dst_x + w : dst_x,
+                              dst_x + dst_w < 4 ? "end" : "start",
+                              dst_x + dst_w < 4 ? dst_x + dst_w : dst_x,
                               4, pipe_src_w - 4);
                 return -ERANGE;
         }
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index a9076402dcb0..192972a7d287 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -943,8 +943,12 @@ static int intel_hdmi_hdcp_write(struct intel_digital_port *intel_dig_port,
 
         ret = i2c_transfer(adapter, &msg, 1);
         if (ret == 1)
-                return 0;
-        return ret >= 0 ? -EIO : ret;
+                ret = 0;
+        else if (ret >= 0)
+                ret = -EIO;
+
+        kfree(write_buf);
+        return ret;
 }
 
 static
diff --git a/drivers/gpu/drm/i915/intel_lspcon.c b/drivers/gpu/drm/i915/intel_lspcon.c
index 5dae16ccd9f1..3e085c5f2b81 100644
--- a/drivers/gpu/drm/i915/intel_lspcon.c
+++ b/drivers/gpu/drm/i915/intel_lspcon.c
@@ -74,7 +74,7 @@ static enum drm_lspcon_mode lspcon_wait_mode(struct intel_lspcon *lspcon,
         DRM_DEBUG_KMS("Waiting for LSPCON mode %s to settle\n",
                       lspcon_mode_name(mode));
 
-        wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 100);
+        wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 400);
         if (current_mode != mode)
                 DRM_ERROR("LSPCON mode hasn't settled\n");
 
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 978782a77629..28d191192945 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -132,6 +132,11 @@ static void mtk_ovl_config(struct mtk_ddp_comp *comp, unsigned int w,
         writel(0x0, comp->regs + DISP_REG_OVL_RST);
 }
 
+static unsigned int mtk_ovl_layer_nr(struct mtk_ddp_comp *comp)
+{
+        return 4;
+}
+
 static void mtk_ovl_layer_on(struct mtk_ddp_comp *comp, unsigned int idx)
 {
         unsigned int reg;
@@ -157,6 +162,11 @@ static void mtk_ovl_layer_off(struct mtk_ddp_comp *comp, unsigned int idx)
 
 static unsigned int ovl_fmt_convert(struct mtk_disp_ovl *ovl, unsigned int fmt)
 {
+        /* The return value in switch "MEM_MODE_INPUT_FORMAT_XXX"
+         * is defined in mediatek HW data sheet.
+         * The alphabet order in XXX is no relation to data
+         * arrangement in memory.
+         */
         switch (fmt) {
         default:
         case DRM_FORMAT_RGB565:
@@ -221,6 +231,7 @@ static const struct mtk_ddp_comp_funcs mtk_disp_ovl_funcs = {
         .stop = mtk_ovl_stop,
         .enable_vblank = mtk_ovl_enable_vblank,
         .disable_vblank = mtk_ovl_disable_vblank,
+        .layer_nr = mtk_ovl_layer_nr,
         .layer_on = mtk_ovl_layer_on,
         .layer_off = mtk_ovl_layer_off,
         .layer_config = mtk_ovl_layer_config,
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
index 585943c81e1f..b0a5cffe345a 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
@@ -31,14 +31,31 @@
 #define RDMA_REG_UPDATE_INT                             BIT(0)
 #define DISP_REG_RDMA_GLOBAL_CON                0x0010
 #define RDMA_ENGINE_EN                                  BIT(0)
+#define RDMA_MODE_MEMORY                                BIT(1)
 #define DISP_REG_RDMA_SIZE_CON_0                0x0014
+#define RDMA_MATRIX_ENABLE                              BIT(17)
+#define RDMA_MATRIX_INT_MTX_SEL                         GENMASK(23, 20)
+#define RDMA_MATRIX_INT_MTX_BT601_to_RGB                (6 << 20)
 #define DISP_REG_RDMA_SIZE_CON_1                0x0018
 #define DISP_REG_RDMA_TARGET_LINE               0x001c
+#define DISP_RDMA_MEM_CON                       0x0024
+#define MEM_MODE_INPUT_FORMAT_RGB565                    (0x000 << 4)
+#define MEM_MODE_INPUT_FORMAT_RGB888                    (0x001 << 4)
+#define MEM_MODE_INPUT_FORMAT_RGBA8888                  (0x002 << 4)
+#define MEM_MODE_INPUT_FORMAT_ARGB8888                  (0x003 << 4)
+#define MEM_MODE_INPUT_FORMAT_UYVY                      (0x004 << 4)
+#define MEM_MODE_INPUT_FORMAT_YUYV                      (0x005 << 4)
+#define MEM_MODE_INPUT_SWAP                             BIT(8)
+#define DISP_RDMA_MEM_SRC_PITCH                 0x002c
+#define DISP_RDMA_MEM_GMC_SETTING_0             0x0030
 #define DISP_REG_RDMA_FIFO_CON                  0x0040
 #define RDMA_FIFO_UNDERFLOW_EN                          BIT(31)
 #define RDMA_FIFO_PSEUDO_SIZE(bytes)                    (((bytes) / 16) << 16)
 #define RDMA_OUTPUT_VALID_FIFO_THRESHOLD(bytes)         ((bytes) / 16)
 #define RDMA_FIFO_SIZE(rdma)                    ((rdma)->data->fifo_size)
+#define DISP_RDMA_MEM_START_ADDR                0x0f00
+
+#define RDMA_MEM_GMC                            0x40402020
 
 struct mtk_disp_rdma_data {
         unsigned int fifo_size;
@@ -138,12 +155,87 @@ static void mtk_rdma_config(struct mtk_ddp_comp *comp, unsigned int width,
         writel(reg, comp->regs + DISP_REG_RDMA_FIFO_CON);
 }
 
+static unsigned int rdma_fmt_convert(struct mtk_disp_rdma *rdma,
+                                     unsigned int fmt)
+{
+        /* The return value in switch "MEM_MODE_INPUT_FORMAT_XXX"
+         * is defined in mediatek HW data sheet.
+         * The alphabet order in XXX is no relation to data
+         * arrangement in memory.
+         */
+        switch (fmt) {
+        default:
+        case DRM_FORMAT_RGB565:
+                return MEM_MODE_INPUT_FORMAT_RGB565;
+        case DRM_FORMAT_BGR565:
+                return MEM_MODE_INPUT_FORMAT_RGB565 | MEM_MODE_INPUT_SWAP;
+        case DRM_FORMAT_RGB888:
+                return MEM_MODE_INPUT_FORMAT_RGB888;
+        case DRM_FORMAT_BGR888:
+                return MEM_MODE_INPUT_FORMAT_RGB888 | MEM_MODE_INPUT_SWAP;
+        case DRM_FORMAT_RGBX8888:
+        case DRM_FORMAT_RGBA8888:
+                return MEM_MODE_INPUT_FORMAT_ARGB8888;
+        case DRM_FORMAT_BGRX8888:
+        case DRM_FORMAT_BGRA8888:
+                return MEM_MODE_INPUT_FORMAT_ARGB8888 | MEM_MODE_INPUT_SWAP;
+        case DRM_FORMAT_XRGB8888:
+        case DRM_FORMAT_ARGB8888:
+                return MEM_MODE_INPUT_FORMAT_RGBA8888;
+        case DRM_FORMAT_XBGR8888:
+        case DRM_FORMAT_ABGR8888:
+                return MEM_MODE_INPUT_FORMAT_RGBA8888 | MEM_MODE_INPUT_SWAP;
+        case DRM_FORMAT_UYVY:
+                return MEM_MODE_INPUT_FORMAT_UYVY;
+        case DRM_FORMAT_YUYV:
+                return MEM_MODE_INPUT_FORMAT_YUYV;
+        }
+}
+
+static unsigned int mtk_rdma_layer_nr(struct mtk_ddp_comp *comp)
+{
+        return 1;
+}
+
+static void mtk_rdma_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
+                                  struct mtk_plane_state *state)
+{
+        struct mtk_disp_rdma *rdma = comp_to_rdma(comp);
+        struct mtk_plane_pending_state *pending = &state->pending;
+        unsigned int addr = pending->addr;
+        unsigned int pitch = pending->pitch & 0xffff;
+        unsigned int fmt = pending->format;
+        unsigned int con;
+
+        con = rdma_fmt_convert(rdma, fmt);
+        writel_relaxed(con, comp->regs + DISP_RDMA_MEM_CON);
+
+        if (fmt == DRM_FORMAT_UYVY || fmt == DRM_FORMAT_YUYV) {
+                rdma_update_bits(comp, DISP_REG_RDMA_SIZE_CON_0,
+                                 RDMA_MATRIX_ENABLE, RDMA_MATRIX_ENABLE);
+                rdma_update_bits(comp, DISP_REG_RDMA_SIZE_CON_0,
+                                 RDMA_MATRIX_INT_MTX_SEL,
+                                 RDMA_MATRIX_INT_MTX_BT601_to_RGB);
+        } else {
+                rdma_update_bits(comp, DISP_REG_RDMA_SIZE_CON_0,
+                                 RDMA_MATRIX_ENABLE, 0);
+        }
+
+        writel_relaxed(addr, comp->regs + DISP_RDMA_MEM_START_ADDR);
+        writel_relaxed(pitch, comp->regs + DISP_RDMA_MEM_SRC_PITCH);
+        writel(RDMA_MEM_GMC, comp->regs + DISP_RDMA_MEM_GMC_SETTING_0);
+        rdma_update_bits(comp, DISP_REG_RDMA_GLOBAL_CON,
+                         RDMA_MODE_MEMORY, RDMA_MODE_MEMORY);
+}
+
 static const struct mtk_ddp_comp_funcs mtk_disp_rdma_funcs = {
         .config = mtk_rdma_config,
         .start = mtk_rdma_start,
         .stop = mtk_rdma_stop,
         .enable_vblank = mtk_rdma_enable_vblank,
         .disable_vblank = mtk_rdma_disable_vblank,
+        .layer_nr = mtk_rdma_layer_nr,
+        .layer_config = mtk_rdma_layer_config,
 };
 
 static int mtk_disp_rdma_bind(struct device *dev, struct device *master,
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 2d6aa150a9ff..0b976dfd04df 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -45,7 +45,8 @@ struct mtk_drm_crtc {
         bool                            pending_needs_vblank;
         struct drm_pending_vblank_event *event;
 
-        struct drm_plane                planes[OVL_LAYER_NR];
+        struct drm_plane                *planes;
+        unsigned int                    layer_nr;
         bool                            pending_planes;
 
         void __iomem                    *config_regs;
@@ -171,9 +172,9 @@ static void mtk_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
 static int mtk_drm_crtc_enable_vblank(struct drm_crtc *crtc)
 {
         struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
-        struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0];
+        struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
 
-        mtk_ddp_comp_enable_vblank(ovl, &mtk_crtc->base);
+        mtk_ddp_comp_enable_vblank(comp, &mtk_crtc->base);
 
         return 0;
 }
@@ -181,9 +182,9 @@ static int mtk_drm_crtc_enable_vblank(struct drm_crtc *crtc)
 static void mtk_drm_crtc_disable_vblank(struct drm_crtc *crtc)
 {
         struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
-        struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0];
+        struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
 
-        mtk_ddp_comp_disable_vblank(ovl);
+        mtk_ddp_comp_disable_vblank(comp);
 }
 
 static int mtk_crtc_ddp_clk_enable(struct mtk_drm_crtc *mtk_crtc)
@@ -286,7 +287,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
         }
 
         /* Initially configure all planes */
-        for (i = 0; i < OVL_LAYER_NR; i++) {
+        for (i = 0; i < mtk_crtc->layer_nr; i++) {
                 struct drm_plane *plane = &mtk_crtc->planes[i];
                 struct mtk_plane_state *plane_state;
 
@@ -334,7 +335,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc)
 {
         struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
         struct mtk_crtc_state *state = to_mtk_crtc_state(mtk_crtc->base.state);
-        struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0];
+        struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
         unsigned int i;
 
         /*
@@ -343,7 +344,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc)
          * queue update module registers on vblank.
          */
         if (state->pending_config) {
-                mtk_ddp_comp_config(ovl, state->pending_width,
+                mtk_ddp_comp_config(comp, state->pending_width,
                                     state->pending_height,
                                     state->pending_vrefresh, 0);
 
@@ -351,14 +352,14 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc)
         }
 
         if (mtk_crtc->pending_planes) {
-                for (i = 0; i < OVL_LAYER_NR; i++) {
+                for (i = 0; i < mtk_crtc->layer_nr; i++) {
                         struct drm_plane *plane = &mtk_crtc->planes[i];
                         struct mtk_plane_state *plane_state;
 
                         plane_state = to_mtk_plane_state(plane->state);
 
                         if (plane_state->pending.config) {
-                                mtk_ddp_comp_layer_config(ovl, i, plane_state);
+                                mtk_ddp_comp_layer_config(comp, i, plane_state);
                                 plane_state->pending.config = false;
                         }
                 }
@@ -370,12 +371,12 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
                                        struct drm_crtc_state *old_state)
 {
         struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
-        struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0];
+        struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
         int ret;
 
         DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id);
 
-        ret = mtk_smi_larb_get(ovl->larb_dev);
+        ret = mtk_smi_larb_get(comp->larb_dev);
         if (ret) {
                 DRM_ERROR("Failed to get larb: %d\n", ret);
                 return;
@@ -383,7 +384,7 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
 
         ret = mtk_crtc_ddp_hw_init(mtk_crtc);
         if (ret) {
-                mtk_smi_larb_put(ovl->larb_dev);
+                mtk_smi_larb_put(comp->larb_dev);
                 return;
         }
 
@@ -395,7 +396,7 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
                                         struct drm_crtc_state *old_state)
 {
         struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
-        struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0];
+        struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
         int i;
 
         DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id);
@@ -403,7 +404,7 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
                 return;
 
         /* Set all pending plane state to disabled */
-        for (i = 0; i < OVL_LAYER_NR; i++) {
+        for (i = 0; i < mtk_crtc->layer_nr; i++) {
                 struct drm_plane *plane = &mtk_crtc->planes[i];
                 struct mtk_plane_state *plane_state;
 
@@ -418,7 +419,7 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
 
         drm_crtc_vblank_off(crtc);
         mtk_crtc_ddp_hw_fini(mtk_crtc);
-        mtk_smi_larb_put(ovl->larb_dev);
+        mtk_smi_larb_put(comp->larb_dev);
 
         mtk_crtc->enabled = false;
 }
@@ -450,7 +451,7 @@ static void mtk_drm_crtc_atomic_flush(struct drm_crtc *crtc,
 
         if (mtk_crtc->event)
                 mtk_crtc->pending_needs_vblank = true;
-        for (i = 0; i < OVL_LAYER_NR; i++) {
+        for (i = 0; i < mtk_crtc->layer_nr; i++) {
                 struct drm_plane *plane = &mtk_crtc->planes[i];
                 struct mtk_plane_state *plane_state;
 
@@ -516,7 +517,7 @@ err_cleanup_crtc:
         return ret;
 }
 
-void mtk_crtc_ddp_irq(struct drm_crtc *crtc, struct mtk_ddp_comp *ovl)
+void mtk_crtc_ddp_irq(struct drm_crtc *crtc, struct mtk_ddp_comp *comp)
 {
         struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
         struct mtk_drm_private *priv = crtc->dev->dev_private;
@@ -598,7 +599,12 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
                 mtk_crtc->ddp_comp[i] = comp;
         }
 
-        for (zpos = 0; zpos < OVL_LAYER_NR; zpos++) {
+        mtk_crtc->layer_nr = mtk_ddp_comp_layer_nr(mtk_crtc->ddp_comp[0]);
+        mtk_crtc->planes = devm_kzalloc(dev, mtk_crtc->layer_nr *
+                                        sizeof(struct drm_plane),
+                                        GFP_KERNEL);
+
+        for (zpos = 0; zpos < mtk_crtc->layer_nr; zpos++) {
                 type = (zpos == 0) ? DRM_PLANE_TYPE_PRIMARY :
                                 (zpos == 1) ? DRM_PLANE_TYPE_CURSOR :
                                                 DRM_PLANE_TYPE_OVERLAY;
@@ -609,7 +615,8 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
         }
 
         ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0],
-                                &mtk_crtc->planes[1], pipe);
+                                mtk_crtc->layer_nr > 1 ? &mtk_crtc->planes[1] :
+                                NULL, pipe);
         if (ret < 0)
                 goto unprepare;
         drm_mode_crtc_set_gamma_size(&mtk_crtc->base, MTK_LUT_SIZE);
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
index 9d9410c67ae9..091adb2087eb 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
@@ -18,13 +18,12 @@
 #include "mtk_drm_ddp_comp.h"
 #include "mtk_drm_plane.h"
 
-#define OVL_LAYER_NR    4
 #define MTK_LUT_SIZE    512
 #define MTK_MAX_BPC     10
 #define MTK_MIN_BPC     3
 
 void mtk_drm_crtc_commit(struct drm_crtc *crtc);
-void mtk_crtc_ddp_irq(struct drm_crtc *crtc, struct mtk_ddp_comp *ovl);
+void mtk_crtc_ddp_irq(struct drm_crtc *crtc, struct mtk_ddp_comp *comp);
 int mtk_drm_crtc_create(struct drm_device *drm_dev,
                         const enum mtk_ddp_comp_id *path,
                         unsigned int path_len);
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
index 87e4191c250e..546b3e3b300b 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
@@ -106,6 +106,8 @@
 #define OVL1_MOUT_EN_COLOR1             0x1
 #define GAMMA_MOUT_EN_RDMA1             0x1
 #define RDMA0_SOUT_DPI0                 0x2
+#define RDMA0_SOUT_DPI1                 0x3
+#define RDMA0_SOUT_DSI1                 0x1
 #define RDMA0_SOUT_DSI2                 0x4
 #define RDMA0_SOUT_DSI3                 0x5
 #define RDMA1_SOUT_DPI0                 0x2
@@ -122,6 +124,8 @@
 #define DPI0_SEL_IN_RDMA2               0x3
 #define DPI1_SEL_IN_RDMA1               (0x1 << 8)
 #define DPI1_SEL_IN_RDMA2               (0x3 << 8)
+#define DSI0_SEL_IN_RDMA1               0x1
+#define DSI0_SEL_IN_RDMA2               0x4
 #define DSI1_SEL_IN_RDMA1               0x1
 #define DSI1_SEL_IN_RDMA2               0x4
 #define DSI2_SEL_IN_RDMA1               (0x1 << 16)
@@ -224,6 +228,12 @@ static unsigned int mtk_ddp_mout_en(enum mtk_ddp_comp_id cur,
         } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DPI0) {
                 *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
                 value = RDMA0_SOUT_DPI0;
+        } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DPI1) {
+                *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
+                value = RDMA0_SOUT_DPI1;
+        } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DSI1) {
+                *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
+                value = RDMA0_SOUT_DSI1;
         } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DSI2) {
                 *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN;
                 value = RDMA0_SOUT_DSI2;
@@ -282,6 +292,9 @@ static unsigned int mtk_ddp_sel_in(enum mtk_ddp_comp_id cur,
         } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DPI1) {
                 *addr = DISP_REG_CONFIG_DPI_SEL_IN;
                 value = DPI1_SEL_IN_RDMA1;
+        } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI0) {
+                *addr = DISP_REG_CONFIG_DSIE_SEL_IN;
+                value = DSI0_SEL_IN_RDMA1;
         } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI1) {
                 *addr = DISP_REG_CONFIG_DSIO_SEL_IN;
                 value = DSI1_SEL_IN_RDMA1;
@@ -297,8 +310,11 @@ static unsigned int mtk_ddp_sel_in(enum mtk_ddp_comp_id cur,
         } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DPI1) {
                 *addr = DISP_REG_CONFIG_DPI_SEL_IN;
                 value = DPI1_SEL_IN_RDMA2;
-        } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI1) {
+        } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI0) {
                 *addr = DISP_REG_CONFIG_DSIE_SEL_IN;
+                value = DSI0_SEL_IN_RDMA2;
+        } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI1) {
+                *addr = DISP_REG_CONFIG_DSIO_SEL_IN;
                 value = DSI1_SEL_IN_RDMA2;
         } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI2) {
                 *addr = DISP_REG_CONFIG_DSIE_SEL_IN;
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
index 7413ffeb3c9d..8399229e6ad2 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
@@ -78,6 +78,7 @@ struct mtk_ddp_comp_funcs {
         void (*stop)(struct mtk_ddp_comp *comp);
         void (*enable_vblank)(struct mtk_ddp_comp *comp, struct drm_crtc *crtc);
         void (*disable_vblank)(struct mtk_ddp_comp *comp);
+        unsigned int (*layer_nr)(struct mtk_ddp_comp *comp);
         void (*layer_on)(struct mtk_ddp_comp *comp, unsigned int idx);
         void (*layer_off)(struct mtk_ddp_comp *comp, unsigned int idx);
         void (*layer_config)(struct mtk_ddp_comp *comp, unsigned int idx,
@@ -128,6 +129,14 @@ static inline void mtk_ddp_comp_disable_vblank(struct mtk_ddp_comp *comp)
                 comp->funcs->disable_vblank(comp);
 }
 
+static inline unsigned int mtk_ddp_comp_layer_nr(struct mtk_ddp_comp *comp)
+{
+        if (comp->funcs && comp->funcs->layer_nr)
+                return comp->funcs->layer_nr(comp);
+
+        return 0;
+}
+
 static inline void mtk_ddp_comp_layer_on(struct mtk_ddp_comp *comp,
                                          unsigned int idx)
 {
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 39721119713b..47ec604289b7 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -381,7 +381,7 @@ static int mtk_drm_bind(struct device *dev)
 err_deinit:
         mtk_drm_kms_deinit(drm);
 err_free:
-        drm_dev_unref(drm);
+        drm_dev_put(drm);
         return ret;
 }
 
@@ -390,7 +390,7 @@ static void mtk_drm_unbind(struct device *dev)
         struct mtk_drm_private *private = dev_get_drvdata(dev);
 
         drm_dev_unregister(private->drm);
-        drm_dev_unref(private->drm);
+        drm_dev_put(private->drm);
         private->drm = NULL;
 }
 
@@ -564,7 +564,7 @@ static int mtk_drm_remove(struct platform_device *pdev)
 
         drm_dev_unregister(drm);
         mtk_drm_kms_deinit(drm);
-        drm_dev_unref(drm);
+        drm_dev_put(drm);
 
         component_master_del(&pdev->dev, &mtk_drm_ops);
         pm_runtime_disable(&pdev->dev);
@@ -580,29 +580,24 @@ static int mtk_drm_sys_suspend(struct device *dev)
 {
         struct mtk_drm_private *private = dev_get_drvdata(dev);
         struct drm_device *drm = private->drm;
+        int ret;
 
-        drm_kms_helper_poll_disable(drm);
-
-        private->suspend_state = drm_atomic_helper_suspend(drm);
-        if (IS_ERR(private->suspend_state)) {
-                drm_kms_helper_poll_enable(drm);
-                return PTR_ERR(private->suspend_state);
-        }
-
+        ret = drm_mode_config_helper_suspend(drm);
         DRM_DEBUG_DRIVER("mtk_drm_sys_suspend\n");
-        return 0;
+
+        return ret;
 }
 
 static int mtk_drm_sys_resume(struct device *dev)
 {
         struct mtk_drm_private *private = dev_get_drvdata(dev);
         struct drm_device *drm = private->drm;
+        int ret;
 
-        drm_atomic_helper_resume(drm, private->suspend_state);
-        drm_kms_helper_poll_enable(drm);
-
+        ret = drm_mode_config_helper_resume(drm);
         DRM_DEBUG_DRIVER("mtk_drm_sys_resume\n");
-        return 0;
+
+        return ret;
 }
 #endif
 
diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c
index 90837f7c7d0f..f4c7516eb989 100644
--- a/drivers/hwmon/adt7475.c
+++ b/drivers/hwmon/adt7475.c
@@ -302,14 +302,18 @@ static inline u16 volt2reg(int channel, long volt, u8 bypass_attn)
         return clamp_val(reg, 0, 1023) & (0xff << 2);
 }
 
-static u16 adt7475_read_word(struct i2c_client *client, int reg)
+static int adt7475_read_word(struct i2c_client *client, int reg)
 {
-        u16 val;
+        int val1, val2;
 
-        val = i2c_smbus_read_byte_data(client, reg);
-        val |= (i2c_smbus_read_byte_data(client, reg + 1) << 8);
+        val1 = i2c_smbus_read_byte_data(client, reg);
+        if (val1 < 0)
+                return val1;
+        val2 = i2c_smbus_read_byte_data(client, reg + 1);
+        if (val2 < 0)
+                return val2;
 
-        return val;
+        return val1 | (val2 << 8);
 }
 
 static void adt7475_write_word(struct i2c_client *client, int reg, u16 val)
@@ -962,13 +966,14 @@ static ssize_t show_pwmfreq(struct device *dev, struct device_attribute *attr,
 {
         struct adt7475_data *data = adt7475_update_device(dev);
         struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
-        int i = clamp_val(data->range[sattr->index] & 0xf, 0,
-                          ARRAY_SIZE(pwmfreq_table) - 1);
+        int idx;
 
         if (IS_ERR(data))
                 return PTR_ERR(data);
+        idx = clamp_val(data->range[sattr->index] & 0xf, 0,
+                        ARRAY_SIZE(pwmfreq_table) - 1);
 
-        return sprintf(buf, "%d\n", pwmfreq_table[i]);
+        return sprintf(buf, "%d\n", pwmfreq_table[idx]);
 }
 
 static ssize_t set_pwmfreq(struct device *dev, struct device_attribute *attr,
@@ -1004,6 +1009,10 @@ static ssize_t pwm_use_point2_pwm_at_crit_show(struct device *dev,
                                         char *buf)
 {
         struct adt7475_data *data = adt7475_update_device(dev);
+
+        if (IS_ERR(data))
+                return PTR_ERR(data);
+
         return sprintf(buf, "%d\n", !!(data->config4 & CONFIG4_MAXDUTY));
 }
 
diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c
index e9e6aeabbf84..71d3445ba869 100644
--- a/drivers/hwmon/ina2xx.c
+++ b/drivers/hwmon/ina2xx.c
@@ -17,7 +17,7 @@
  * Bi-directional Current/Power Monitor with I2C Interface
  * Datasheet: http://www.ti.com/product/ina230
  *
- * Copyright (C) 2012 Lothar Felten <l-felten@ti.com>
+ * Copyright (C) 2012 Lothar Felten <lothar.felten@gmail.com>
  * Thanks to Jan Volkering
  *
  * This program is free software; you can redistribute it and/or modify
@@ -329,6 +329,15 @@ static int ina2xx_set_shunt(struct ina2xx_data *data, long val)
         return 0;
 }
 
+static ssize_t ina2xx_show_shunt(struct device *dev,
+                              struct device_attribute *da,
+                              char *buf)
+{
+        struct ina2xx_data *data = dev_get_drvdata(dev);
+
+        return snprintf(buf, PAGE_SIZE, "%li\n", data->rshunt);
+}
+
 static ssize_t ina2xx_store_shunt(struct device *dev,
                                   struct device_attribute *da,
                                   const char *buf, size_t count)
@@ -403,7 +412,7 @@ static SENSOR_DEVICE_ATTR(power1_input, S_IRUGO, ina2xx_show_value, NULL,
 
 /* shunt resistance */
 static SENSOR_DEVICE_ATTR(shunt_resistor, S_IRUGO | S_IWUSR,
-                          ina2xx_show_value, ina2xx_store_shunt,
+                          ina2xx_show_shunt, ina2xx_store_shunt,
                           INA2XX_CALIBRATION);
 
 /* update interval (ina226 only) */
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
index c6bd61e4695a..944f5b63aecd 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -63,6 +63,7 @@
 #include <linux/bitops.h>
 #include <linux/dmi.h>
 #include <linux/io.h>
+#include <linux/nospec.h>
 #include "lm75.h"
 
 #define USE_ALTERNATE
@@ -2689,6 +2690,7 @@ store_pwm_weight_temp_sel(struct device *dev, struct device_attribute *attr,
                 return err;
         if (val > NUM_TEMP)
                 return -EINVAL;
+        val = array_index_nospec(val, NUM_TEMP + 1);
         if (val && (!(data->have_temp & BIT(val - 1)) ||
                     !data->temp_src[val - 1]))
                 return -EINVAL;
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 6ec65adaba49..c33dcfb87993 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -110,8 +110,8 @@ static int sclhi(struct i2c_algo_bit_data *adap)
         }
 #ifdef DEBUG
         if (jiffies != start && i2c_debug >= 3)
-                pr_debug("i2c-algo-bit: needed %ld jiffies for SCL to go "
-                         "high\n", jiffies - start);
+                pr_debug("i2c-algo-bit: needed %ld jiffies for SCL to go high\n",
+                         jiffies - start);
 #endif
 
 done:
@@ -171,8 +171,9 @@ static int i2c_outb(struct i2c_adapter *i2c_adap, unsigned char c)
                 setsda(adap, sb);
                 udelay((adap->udelay + 1) / 2);
                 if (sclhi(adap) < 0) { /* timed out */
-                        bit_dbg(1, &i2c_adap->dev, "i2c_outb: 0x%02x, "
-                                "timeout at bit #%d\n", (int)c, i);
+                        bit_dbg(1, &i2c_adap->dev,
+                                "i2c_outb: 0x%02x, timeout at bit #%d\n",
+                                (int)c, i);
                         return -ETIMEDOUT;
                 }
                 /* FIXME do arbitration here:
@@ -185,8 +186,8 @@ static int i2c_outb(struct i2c_adapter *i2c_adap, unsigned char c)
         }
         sdahi(adap);
         if (sclhi(adap) < 0) { /* timeout */
-                bit_dbg(1, &i2c_adap->dev, "i2c_outb: 0x%02x, "
-                        "timeout at ack\n", (int)c);
+                bit_dbg(1, &i2c_adap->dev,
+                        "i2c_outb: 0x%02x, timeout at ack\n", (int)c);
                 return -ETIMEDOUT;
         }
 
@@ -215,8 +216,9 @@ static int i2c_inb(struct i2c_adapter *i2c_adap)
         sdahi(adap);
         for (i = 0; i < 8; i++) {
                 if (sclhi(adap) < 0) { /* timeout */
-                        bit_dbg(1, &i2c_adap->dev, "i2c_inb: timeout at bit "
-                                "#%d\n", 7 - i);
+                        bit_dbg(1, &i2c_adap->dev,
+                                "i2c_inb: timeout at bit #%d\n",
+                                7 - i);
                         return -ETIMEDOUT;
                 }
                 indata *= 2;
@@ -265,8 +267,9 @@ static int test_bus(struct i2c_adapter *i2c_adap)
                 goto bailout;
         }
         if (!scl) {
-                printk(KERN_WARNING "%s: SCL unexpected low "
-                       "while pulling SDA low!\n", name);
+                printk(KERN_WARNING
+                       "%s: SCL unexpected low while pulling SDA low!\n",
+                       name);
                 goto bailout;
         }
 
@@ -278,8 +281,9 @@ static int test_bus(struct i2c_adapter *i2c_adap)
                 goto bailout;
         }
         if (!scl) {
-                printk(KERN_WARNING "%s: SCL unexpected low "
-                       "while pulling SDA high!\n", name);
+                printk(KERN_WARNING
+                       "%s: SCL unexpected low while pulling SDA high!\n",
+                       name);
                 goto bailout;
         }
 
@@ -291,8 +295,9 @@ static int test_bus(struct i2c_adapter *i2c_adap)
                 goto bailout;
         }
         if (!sda) {
-                printk(KERN_WARNING "%s: SDA unexpected low "
-                       "while pulling SCL low!\n", name);
+                printk(KERN_WARNING
+                       "%s: SDA unexpected low while pulling SCL low!\n",
+                       name);
                 goto bailout;
         }
 
@@ -304,8 +309,9 @@ static int test_bus(struct i2c_adapter *i2c_adap)
                 goto bailout;
         }
         if (!sda) {
-                printk(KERN_WARNING "%s: SDA unexpected low "
-                       "while pulling SCL high!\n", name);
+                printk(KERN_WARNING
+                       "%s: SDA unexpected low while pulling SCL high!\n",
+                       name);
                 goto bailout;
         }
 
@@ -352,8 +358,8 @@ static int try_address(struct i2c_adapter *i2c_adap,
                 i2c_start(adap);
         }
         if (i && ret)
-                bit_dbg(1, &i2c_adap->dev, "Used %d tries to %s client at "
-                        "0x%02x: %s\n", i + 1,
+                bit_dbg(1, &i2c_adap->dev,
+                        "Used %d tries to %s client at 0x%02x: %s\n", i + 1,
                         addr & 1 ? "read from" : "write to", addr >> 1,
                         ret == 1 ? "success" : "failed, timeout?");
         return ret;
@@ -442,8 +448,9 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                         if (inval <= 0 || inval > I2C_SMBUS_BLOCK_MAX) {
                                 if (!(flags & I2C_M_NO_RD_ACK))
                                         acknak(i2c_adap, 0);
-                                dev_err(&i2c_adap->dev, "readbytes: invalid "
-                                        "block length (%d)\n", inval);
+                                dev_err(&i2c_adap->dev,
+                                        "readbytes: invalid block length (%d)\n",
+                                        inval);
                                 return -EPROTO;
                         }
                         /* The original count value accounts for the extra
@@ -506,8 +513,8 @@ static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                         return -ENXIO;
                 }
                 if (flags & I2C_M_RD) {
-                        bit_dbg(3, &i2c_adap->dev, "emitting repeated "
-                                "start condition\n");
+                        bit_dbg(3, &i2c_adap->dev,
+                                "emitting repeated start condition\n");
                         i2c_repstart(adap);
                         /* okay, now switch into reading mode */
                         addr |= 0x01;
@@ -564,8 +571,8 @@ static int bit_xfer(struct i2c_adapter *i2c_adap,
                         }
                         ret = bit_doAddress(i2c_adap, pmsg);
                         if ((ret != 0) && !nak_ok) {
-                                bit_dbg(1, &i2c_adap->dev, "NAK from "
-                                        "device addr 0x%02x msg #%d\n",
+                                bit_dbg(1, &i2c_adap->dev,
+                                        "NAK from device addr 0x%02x msg #%d\n",
                                         msgs[i].addr, i);
                                 goto bailout;
                         }
diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
index e18442b9973a..94d94b4a9a0d 100644
--- a/drivers/i2c/busses/i2c-designware-master.c
+++ b/drivers/i2c/busses/i2c-designware-master.c
@@ -708,7 +708,6 @@ int i2c_dw_probe(struct dw_i2c_dev *dev)
         i2c_set_adapdata(adap, dev);
 
         if (dev->pm_disabled) {
-                dev_pm_syscore_device(dev->dev, true);
                 irq_flags = IRQF_NO_SUSPEND;
         } else {
                 irq_flags = IRQF_SHARED | IRQF_COND_SUSPEND;
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 1a8d2da5b000..b5750fd85125 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -434,6 +434,9 @@ static int dw_i2c_plat_suspend(struct device *dev)
 {
         struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
 
+        if (i_dev->pm_disabled)
+                return 0;
+
         i_dev->disable(i_dev);
         i2c_dw_prepare_clk(i_dev, false);
 
@@ -444,7 +447,9 @@ static int dw_i2c_plat_resume(struct device *dev)
 {
         struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
 
-        i2c_dw_prepare_clk(i_dev, true);
+        if (!i_dev->pm_disabled)
+                i2c_dw_prepare_clk(i_dev, true);
+
         i_dev->init(i_dev);
 
         return 0;
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 941c223f6491..04b60a349d7e 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -1415,6 +1415,13 @@ static void i801_add_tco(struct i801_priv *priv)
 }
 
 #ifdef CONFIG_ACPI
+static bool i801_acpi_is_smbus_ioport(const struct i801_priv *priv,
+                                      acpi_physical_address address)
+{
+        return address >= priv->smba &&
+               address <= pci_resource_end(priv->pci_dev, SMBBAR);
+}
+
 static acpi_status
 i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits,
                      u64 *value, void *handler_context, void *region_context)
@@ -1430,7 +1437,7 @@ i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits,
          */
         mutex_lock(&priv->acpi_lock);
 
-        if (!priv->acpi_reserved) {
+        if (!priv->acpi_reserved && i801_acpi_is_smbus_ioport(priv, address)) {
                 priv->acpi_reserved = true;
 
                 dev_warn(&pdev->dev, "BIOS is accessing SMBus registers\n");
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 439e8778f849..818cab14e87c 100644
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -507,8 +507,6 @@ static void sh_mobile_i2c_dma_callback(void *data)
         pd->pos = pd->msg->len;
         pd->stop_after_dma = true;
 
-        i2c_release_dma_safe_msg_buf(pd->msg, pd->dma_buf);
-
         iic_set_clr(pd, ICIC, 0, ICIC_TDMAE | ICIC_RDMAE);
 }
 
@@ -602,8 +600,8 @@ static void sh_mobile_i2c_xfer_dma(struct sh_mobile_i2c_data *pd)
         dma_async_issue_pending(chan);
 }
 
-static int start_ch(struct sh_mobile_i2c_data *pd, struct i2c_msg *usr_msg,
-                    bool do_init)
+static void start_ch(struct sh_mobile_i2c_data *pd, struct i2c_msg *usr_msg,
+                     bool do_init)
 {
         if (do_init) {
                 /* Initialize channel registers */
@@ -627,7 +625,6 @@ static int start_ch(struct sh_mobile_i2c_data *pd, struct i2c_msg *usr_msg,
 
         /* Enable all interrupts to begin with */
         iic_wr(pd, ICIC, ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE);
-        return 0;
 }
 
 static int poll_dte(struct sh_mobile_i2c_data *pd)
@@ -698,9 +695,7 @@ static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter,
                 pd->send_stop = i == num - 1 || msg->flags & I2C_M_STOP;
                 pd->stop_after_dma = false;
 
-                err = start_ch(pd, msg, do_start);
-                if (err)
-                        break;
+                start_ch(pd, msg, do_start);
 
                 if (do_start)
                         i2c_op(pd, OP_START, 0);
@@ -709,6 +704,10 @@ static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter,
                 timeout = wait_event_timeout(pd->wait,
                                        pd->sr & (ICSR_TACK | SW_DONE),
                                        adapter->timeout);
+
+                /* 'stop_after_dma' tells if DMA transfer was complete */
+                i2c_put_dma_safe_msg_buf(pd->dma_buf, pd->msg, pd->stop_after_dma);
+
                 if (!timeout) {
                         dev_err(pd->dev, "Transfer request timed out\n");
                         if (pd->dma_direction != DMA_NONE)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index f15737763608..9ee9a15e7134 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -2293,21 +2293,22 @@ u8 *i2c_get_dma_safe_msg_buf(struct i2c_msg *msg, unsigned int threshold)
 EXPORT_SYMBOL_GPL(i2c_get_dma_safe_msg_buf);
 
 /**
- * i2c_release_dma_safe_msg_buf - release DMA safe buffer and sync with i2c_msg
- * @msg: the message to be synced with
+ * i2c_put_dma_safe_msg_buf - release DMA safe buffer and sync with i2c_msg
  * @buf: the buffer obtained from i2c_get_dma_safe_msg_buf(). May be NULL.
+ * @msg: the message which the buffer corresponds to
+ * @xferred: bool saying if the message was transferred
  */
-void i2c_release_dma_safe_msg_buf(struct i2c_msg *msg, u8 *buf)
+void i2c_put_dma_safe_msg_buf(u8 *buf, struct i2c_msg *msg, bool xferred)
 {
         if (!buf || buf == msg->buf)
                 return;
 
-        if (msg->flags & I2C_M_RD)
+        if (xferred && msg->flags & I2C_M_RD)
                 memcpy(msg->buf, buf, msg->len);
 
         kfree(buf);
 }
-EXPORT_SYMBOL_GPL(i2c_release_dma_safe_msg_buf);
+EXPORT_SYMBOL_GPL(i2c_put_dma_safe_msg_buf);
 
 MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
 MODULE_DESCRIPTION("I2C-Bus main module");
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
index 648eb6743ed5..6edffeed9953 100644
--- a/drivers/mmc/core/queue.c
+++ b/drivers/mmc/core/queue.c
@@ -238,10 +238,6 @@ static void mmc_mq_exit_request(struct blk_mq_tag_set *set, struct request *req,
         mmc_exit_request(mq->queue, req);
 }
 
-/*
- * We use BLK_MQ_F_BLOCKING and have only 1 hardware queue, which means requests
- * will not be dispatched in parallel.
- */
 static blk_status_t mmc_mq_queue_rq(struct blk_mq_hw_ctx *hctx,
                                     const struct blk_mq_queue_data *bd)
 {
@@ -264,7 +260,7 @@ static blk_status_t mmc_mq_queue_rq(struct blk_mq_hw_ctx *hctx,
 
         spin_lock_irq(q->queue_lock);
 
-        if (mq->recovery_needed) {
+        if (mq->recovery_needed || mq->busy) {
                 spin_unlock_irq(q->queue_lock);
                 return BLK_STS_RESOURCE;
         }
@@ -291,6 +287,9 @@ static blk_status_t mmc_mq_queue_rq(struct blk_mq_hw_ctx *hctx,
                 break;
         }
 
+        /* Parallel dispatch of requests is not supported at the moment */
+        mq->busy = true;
+
         mq->in_flight[issue_type] += 1;
         get_card = (mmc_tot_in_flight(mq) == 1);
         cqe_retune_ok = (mmc_cqe_qcnt(mq) == 1);
@@ -333,9 +332,12 @@ static blk_status_t mmc_mq_queue_rq(struct blk_mq_hw_ctx *hctx,
                 mq->in_flight[issue_type] -= 1;
                 if (mmc_tot_in_flight(mq) == 0)
                         put_card = true;
+                mq->busy = false;
                 spin_unlock_irq(q->queue_lock);
                 if (put_card)
                         mmc_put_card(card, &mq->ctx);
+        } else {
+                WRITE_ONCE(mq->busy, false);
         }
 
         return ret;
diff --git a/drivers/mmc/core/queue.h b/drivers/mmc/core/queue.h
index 17e59d50b496..9bf3c9245075 100644
--- a/drivers/mmc/core/queue.h
+++ b/drivers/mmc/core/queue.h
@@ -81,6 +81,7 @@ struct mmc_queue {
         unsigned int            cqe_busy;
 #define MMC_CQE_DCMD_BUSY       BIT(0)
 #define MMC_CQE_QUEUE_FULL      BIT(1)
+        bool                    busy;
         bool                    use_cqe;
         bool                    recovery_needed;
         bool                    in_recovery;
diff --git a/drivers/mmc/host/android-goldfish.c b/drivers/mmc/host/android-goldfish.c
index 294de177632c..61e4e2a213c9 100644
--- a/drivers/mmc/host/android-goldfish.c
+++ b/drivers/mmc/host/android-goldfish.c
@@ -217,7 +217,7 @@ static void goldfish_mmc_xfer_done(struct goldfish_mmc_host *host,
                          * We don't really have DMA, so we need
                          * to copy from our platform driver buffer
                          */
-                        sg_copy_to_buffer(data->sg, 1, host->virt_base,
+                        sg_copy_from_buffer(data->sg, 1, host->virt_base,
                                         data->sg->length);
                 }
                 host->data->bytes_xfered += data->sg->length;
@@ -393,7 +393,7 @@ static void goldfish_mmc_prepare_data(struct goldfish_mmc_host *host,
                  * We don't really have DMA, so we need to copy to our
                  * platform driver buffer
                  */
-                sg_copy_from_buffer(data->sg, 1, host->virt_base,
+                sg_copy_to_buffer(data->sg, 1, host->virt_base,
                                 data->sg->length);
         }
 }
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 5aa2c9404e92..be53044086c7 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -1976,7 +1976,7 @@ static void atmci_read_data_pio(struct atmel_mci *host)
         do {
                 value = atmci_readl(host, ATMCI_RDR);
                 if (likely(offset + 4 <= sg->length)) {
-                        sg_pcopy_to_buffer(sg, 1, &value, sizeof(u32), offset);
+                        sg_pcopy_from_buffer(sg, 1, &value, sizeof(u32), offset);
 
                         offset += 4;
                         nbytes += 4;
@@ -1993,7 +1993,7 @@ static void atmci_read_data_pio(struct atmel_mci *host)
                 } else {
                         unsigned int remaining = sg->length - offset;
 
-                        sg_pcopy_to_buffer(sg, 1, &value, remaining, offset);
+                        sg_pcopy_from_buffer(sg, 1, &value, remaining, offset);
                         nbytes += remaining;
 
                         flush_dcache_page(sg_page(sg));
@@ -2003,7 +2003,7 @@ static void atmci_read_data_pio(struct atmel_mci *host)
                                 goto done;
 
                         offset = 4 - remaining;
-                        sg_pcopy_to_buffer(sg, 1, (u8 *)&value + remaining,
+                        sg_pcopy_from_buffer(sg, 1, (u8 *)&value + remaining,
                                         offset, 0);
                         nbytes += offset;
                 }
@@ -2042,7 +2042,7 @@ static void atmci_write_data_pio(struct atmel_mci *host)
 
         do {
                 if (likely(offset + 4 <= sg->length)) {
-                        sg_pcopy_from_buffer(sg, 1, &value, sizeof(u32), offset);
+                        sg_pcopy_to_buffer(sg, 1, &value, sizeof(u32), offset);
                         atmci_writel(host, ATMCI_TDR, value);
 
                         offset += 4;
@@ -2059,7 +2059,7 @@ static void atmci_write_data_pio(struct atmel_mci *host)
                         unsigned int remaining = sg->length - offset;
 
                         value = 0;
-                        sg_pcopy_from_buffer(sg, 1, &value, remaining, offset);
+                        sg_pcopy_to_buffer(sg, 1, &value, remaining, offset);
                         nbytes += remaining;
 
                         host->sg = sg = sg_next(sg);
@@ -2070,7 +2070,7 @@ static void atmci_write_data_pio(struct atmel_mci *host)
                         }
 
                         offset = 4 - remaining;
-                        sg_pcopy_from_buffer(sg, 1, (u8 *)&value + remaining,
+                        sg_pcopy_to_buffer(sg, 1, (u8 *)&value + remaining,
                                         offset, 0);
                         atmci_writel(host, ATMCI_TDR, value);
                         nbytes += offset;
diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
index 35cc0de6be67..ca0b43973769 100644
--- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -45,14 +45,16 @@
 /* DM_CM_RST */
 #define RST_DTRANRST1           BIT(9)
 #define RST_DTRANRST0           BIT(8)
-#define RST_RESERVED_BITS       GENMASK_ULL(32, 0)
+#define RST_RESERVED_BITS       GENMASK_ULL(31, 0)
 
 /* DM_CM_INFO1 and DM_CM_INFO1_MASK */
 #define INFO1_CLEAR             0
+#define INFO1_MASK_CLEAR        GENMASK_ULL(31, 0)
 #define INFO1_DTRANEND1         BIT(17)
 #define INFO1_DTRANEND0         BIT(16)
 
 /* DM_CM_INFO2 and DM_CM_INFO2_MASK */
+#define INFO2_MASK_CLEAR        GENMASK_ULL(31, 0)
 #define INFO2_DTRANERR1         BIT(17)
 #define INFO2_DTRANERR0         BIT(16)
 
@@ -252,6 +254,12 @@ renesas_sdhi_internal_dmac_request_dma(struct tmio_mmc_host *host,
 {
         struct renesas_sdhi *priv = host_to_priv(host);
 
+        /* Disable DMAC interrupts, we don't use them */
+        renesas_sdhi_internal_dmac_dm_write(host, DM_CM_INFO1_MASK,
+                                            INFO1_MASK_CLEAR);
+        renesas_sdhi_internal_dmac_dm_write(host, DM_CM_INFO2_MASK,
+                                            INFO2_MASK_CLEAR);
+
         /* Each value is set to non-zero to assume "enabling" each DMA */
         host->chan_rx = host->chan_tx = (void *)0xdeadbeaf;
 
diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c
index ca18612c4201..67b2065e7a19 100644
--- a/drivers/mtd/nand/raw/denali.c
+++ b/drivers/mtd/nand/raw/denali.c
@@ -1338,6 +1338,11 @@ int denali_init(struct denali_nand_info *denali)
 
         denali_enable_irq(denali);
         denali_reset_banks(denali);
+        if (!denali->max_banks) {
+                /* Error out earlier if no chip is found for some reasons. */
+                ret = -ENODEV;
+                goto disable_irq;
+        }
 
         denali->active_bank = DENALI_INVALID_BANK;
 
diff --git a/drivers/mtd/nand/raw/docg4.c b/drivers/mtd/nand/raw/docg4.c
index a3f04315c05c..427fcbc1b71c 100644
--- a/drivers/mtd/nand/raw/docg4.c
+++ b/drivers/mtd/nand/raw/docg4.c
@@ -1218,7 +1218,7 @@ static int docg4_resume(struct platform_device *pdev)
         return 0;
 }
 
-static void __init init_mtd_structs(struct mtd_info *mtd)
+static void init_mtd_structs(struct mtd_info *mtd)
 {
         /* initialize mtd and nand data structures */
 
@@ -1290,7 +1290,7 @@ static void __init init_mtd_structs(struct mtd_info *mtd)
 
 }
 
-static int __init read_id_reg(struct mtd_info *mtd)
+static int read_id_reg(struct mtd_info *mtd)
 {
         struct nand_chip *nand = mtd_to_nand(mtd);
         struct docg4_priv *doc = nand_get_controller_data(nand);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 8bb1e38b1681..cecbb1d1f587 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -5913,12 +5913,12 @@ unsigned int bnxt_get_max_func_cp_rings(struct bnxt *bp)
         return bp->hw_resc.max_cp_rings;
 }
 
-void bnxt_set_max_func_cp_rings(struct bnxt *bp, unsigned int max)
+unsigned int bnxt_get_max_func_cp_rings_for_en(struct bnxt *bp)
 {
-        bp->hw_resc.max_cp_rings = max;
+        return bp->hw_resc.max_cp_rings - bnxt_get_ulp_msix_num(bp);
 }
 
-unsigned int bnxt_get_max_func_irqs(struct bnxt *bp)
+static unsigned int bnxt_get_max_func_irqs(struct bnxt *bp)
 {
         struct bnxt_hw_resc *hw_resc = &bp->hw_resc;
 
@@ -6684,6 +6684,8 @@ static int bnxt_hwrm_if_change(struct bnxt *bp, bool up)
                 hw_resc->resv_rx_rings = 0;
                 hw_resc->resv_hw_ring_grps = 0;
                 hw_resc->resv_vnics = 0;
+                bp->tx_nr_rings = 0;
+                bp->rx_nr_rings = 0;
         }
         return rc;
 }
@@ -8629,7 +8631,8 @@ static void _bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx,
 
         *max_tx = hw_resc->max_tx_rings;
         *max_rx = hw_resc->max_rx_rings;
-        *max_cp = min_t(int, hw_resc->max_irqs, hw_resc->max_cp_rings);
+        *max_cp = min_t(int, bnxt_get_max_func_cp_rings_for_en(bp),
+                        hw_resc->max_irqs);
         *max_cp = min_t(int, *max_cp, hw_resc->max_stat_ctxs);
         max_ring_grps = hw_resc->max_hw_ring_grps;
         if (BNXT_CHIP_TYPE_NITRO_A0(bp) && BNXT_PF(bp)) {
@@ -8769,20 +8772,25 @@ static int bnxt_init_dflt_ring_mode(struct bnxt *bp)
         if (bp->tx_nr_rings)
                 return 0;
 
+        bnxt_ulp_irq_stop(bp);
+        bnxt_clear_int_mode(bp);
         rc = bnxt_set_dflt_rings(bp, true);
         if (rc) {
                 netdev_err(bp->dev, "Not enough rings available.\n");
-                return rc;
+                goto init_dflt_ring_err;
         }
         rc = bnxt_init_int_mode(bp);
         if (rc)
-                return rc;
+                goto init_dflt_ring_err;
+
         bp->tx_nr_rings_per_tc = bp->tx_nr_rings;
         if (bnxt_rfs_supported(bp) && bnxt_rfs_capable(bp)) {
                 bp->flags |= BNXT_FLAG_RFS;
                 bp->dev->features |= NETIF_F_NTUPLE;
         }
-        return 0;
+init_dflt_ring_err:
+        bnxt_ulp_irq_restart(bp, rc);
+        return rc;
 }
 
 int bnxt_restore_pf_fw_resources(struct bnxt *bp)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index fefa011320e0..bde384630a75 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1481,8 +1481,7 @@ int bnxt_hwrm_set_coal(struct bnxt *);
 unsigned int bnxt_get_max_func_stat_ctxs(struct bnxt *bp);
 void bnxt_set_max_func_stat_ctxs(struct bnxt *bp, unsigned int max);
 unsigned int bnxt_get_max_func_cp_rings(struct bnxt *bp);
-void bnxt_set_max_func_cp_rings(struct bnxt *bp, unsigned int max);
-unsigned int bnxt_get_max_func_irqs(struct bnxt *bp);
+unsigned int bnxt_get_max_func_cp_rings_for_en(struct bnxt *bp);
 int bnxt_get_avail_msix(struct bnxt *bp, int num);
 int bnxt_reserve_rings(struct bnxt *bp);
 void bnxt_tx_disable(struct bnxt *bp);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
index 6d583bcd2a81..fcd085a9853a 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -451,7 +451,7 @@ static int bnxt_hwrm_func_vf_resc_cfg(struct bnxt *bp, int num_vfs)
 
         bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_VF_RESOURCE_CFG, -1, -1);
 
-        vf_cp_rings = hw_resc->max_cp_rings - bp->cp_nr_rings;
+        vf_cp_rings = bnxt_get_max_func_cp_rings_for_en(bp) - bp->cp_nr_rings;
         vf_stat_ctx = hw_resc->max_stat_ctxs - bp->num_stat_ctxs;
         if (bp->flags & BNXT_FLAG_AGG_RINGS)
                 vf_rx_rings = hw_resc->max_rx_rings - bp->rx_nr_rings * 2;
@@ -549,7 +549,8 @@ static int bnxt_hwrm_func_cfg(struct bnxt *bp, int num_vfs)
         max_stat_ctxs = hw_resc->max_stat_ctxs;
 
         /* Remaining rings are distributed equally amongs VF's for now */
-        vf_cp_rings = (hw_resc->max_cp_rings - bp->cp_nr_rings) / num_vfs;
+        vf_cp_rings = (bnxt_get_max_func_cp_rings_for_en(bp) -
+                       bp->cp_nr_rings) / num_vfs;
         vf_stat_ctx = (max_stat_ctxs - bp->num_stat_ctxs) / num_vfs;
         if (bp->flags & BNXT_FLAG_AGG_RINGS)
                 vf_rx_rings = (hw_resc->max_rx_rings - bp->rx_nr_rings * 2) /
@@ -643,7 +644,7 @@ static int bnxt_sriov_enable(struct bnxt *bp, int *num_vfs)
          */
         vfs_supported = *num_vfs;
 
-        avail_cp = hw_resc->max_cp_rings - bp->cp_nr_rings;
+        avail_cp = bnxt_get_max_func_cp_rings_for_en(bp) - bp->cp_nr_rings;
         avail_stat = hw_resc->max_stat_ctxs - bp->num_stat_ctxs;
         avail_cp = min_t(int, avail_cp, avail_stat);
 
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
index c37b2842f972..beee61292d5e 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
@@ -169,7 +169,6 @@ static int bnxt_req_msix_vecs(struct bnxt_en_dev *edev, int ulp_id,
                 edev->ulp_tbl[ulp_id].msix_requested = avail_msix;
         }
         bnxt_fill_msix_vecs(bp, ent);
-        bnxt_set_max_func_cp_rings(bp, max_cp_rings - avail_msix);
         edev->flags |= BNXT_EN_FLAG_MSIX_REQUESTED;
         return avail_msix;
 }
@@ -178,7 +177,6 @@ static int bnxt_free_msix_vecs(struct bnxt_en_dev *edev, int ulp_id)
 {
         struct net_device *dev = edev->net;
         struct bnxt *bp = netdev_priv(dev);
-        int max_cp_rings, msix_requested;
 
         ASSERT_RTNL();
         if (ulp_id != BNXT_ROCE_ULP)
@@ -187,9 +185,6 @@ static int bnxt_free_msix_vecs(struct bnxt_en_dev *edev, int ulp_id)
         if (!(edev->flags & BNXT_EN_FLAG_MSIX_REQUESTED))
                 return 0;
 
-        max_cp_rings = bnxt_get_max_func_cp_rings(bp);
-        msix_requested = edev->ulp_tbl[ulp_id].msix_requested;
-        bnxt_set_max_func_cp_rings(bp, max_cp_rings + msix_requested);
         edev->ulp_tbl[ulp_id].msix_requested = 0;
         edev->flags &= ~BNXT_EN_FLAG_MSIX_REQUESTED;
         if (netif_running(dev)) {
@@ -220,21 +215,6 @@ int bnxt_get_ulp_msix_base(struct bnxt *bp)
         return 0;
 }
 
-void bnxt_subtract_ulp_resources(struct bnxt *bp, int ulp_id)
-{
-        ASSERT_RTNL();
-        if (bnxt_ulp_registered(bp->edev, ulp_id)) {
-                struct bnxt_en_dev *edev = bp->edev;
-                unsigned int msix_req, max;
-
-                msix_req = edev->ulp_tbl[ulp_id].msix_requested;
-                max = bnxt_get_max_func_cp_rings(bp);
-                bnxt_set_max_func_cp_rings(bp, max - msix_req);
-                max = bnxt_get_max_func_stat_ctxs(bp);
-                bnxt_set_max_func_stat_ctxs(bp, max - 1);
-        }
-}
-
 static int bnxt_send_msg(struct bnxt_en_dev *edev, int ulp_id,
                          struct bnxt_fw_msg *fw_msg)
 {
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h
index df48ac71729f..d9bea37cd211 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h
@@ -90,7 +90,6 @@ static inline bool bnxt_ulp_registered(struct bnxt_en_dev *edev, int ulp_id)
 
 int bnxt_get_ulp_msix_num(struct bnxt *bp);
 int bnxt_get_ulp_msix_base(struct bnxt *bp);
-void bnxt_subtract_ulp_resources(struct bnxt *bp, int ulp_id);
 void bnxt_ulp_stop(struct bnxt *bp);
 void bnxt_ulp_start(struct bnxt *bp);
 void bnxt_ulp_sriov_cfg(struct bnxt *bp, int num_vfs);
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
index b773bc07edf7..14b49612aa86 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
@@ -186,6 +186,9 @@ struct bcmgenet_mib_counters {
 #define UMAC_MAC1                       0x010
 #define UMAC_MAX_FRAME_LEN              0x014
 
+#define UMAC_MODE                       0x44
+#define  MODE_LINK_STATUS               (1 << 5)
+
 #define UMAC_EEE_CTRL                   0x064
 #define  EN_LPI_RX_PAUSE                (1 << 0)
 #define  EN_LPI_TX_PFC                  (1 << 1)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index 5333274a283c..4241ae928d4a 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -115,8 +115,14 @@ void bcmgenet_mii_setup(struct net_device *dev)
 static int bcmgenet_fixed_phy_link_update(struct net_device *dev,
                                           struct fixed_phy_status *status)
 {
-        if (dev && dev->phydev && status)
-                status->link = dev->phydev->link;
+        struct bcmgenet_priv *priv;
+        u32 reg;
+
+        if (dev && dev->phydev && status) {
+                priv = netdev_priv(dev);
+                reg = bcmgenet_umac_readl(priv, UMAC_MODE);
+                status->link = !!(reg & MODE_LINK_STATUS);
+        }
 
         return 0;
 }
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index c6707ea2d751..16e4ef7d7185 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -649,7 +649,7 @@ static int macb_halt_tx(struct macb *bp)
                 if (!(status & MACB_BIT(TGO)))
                         return 0;
 
-                usleep_range(10, 250);
+                udelay(250);
         } while (time_before(halt_time, timeout));
 
         return -ETIMEDOUT;
diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.h b/drivers/net/ethernet/hisilicon/hns/hnae.h
index cad52bd331f7..08a750fb60c4 100644
--- a/drivers/net/ethernet/hisilicon/hns/hnae.h
+++ b/drivers/net/ethernet/hisilicon/hns/hnae.h
@@ -486,6 +486,8 @@ struct hnae_ae_ops {
                         u8 *auto_neg, u16 *speed, u8 *duplex);
         void (*toggle_ring_irq)(struct hnae_ring *ring, u32 val);
         void (*adjust_link)(struct hnae_handle *handle, int speed, int duplex);
+        bool (*need_adjust_link)(struct hnae_handle *handle,
+                                 int speed, int duplex);
         int (*set_loopback)(struct hnae_handle *handle,
                             enum hnae_loop loop_mode, int en);
         void (*get_ring_bdnum_limit)(struct hnae_queue *queue,
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
index e6aad30e7e69..b52029e26d15 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
@@ -155,6 +155,41 @@ static void hns_ae_put_handle(struct hnae_handle *handle)
                 hns_ae_get_ring_pair(handle->qs[i])->used_by_vf = 0;
 }
 
+static int hns_ae_wait_flow_down(struct hnae_handle *handle)
+{
+        struct dsaf_device *dsaf_dev;
+        struct hns_ppe_cb *ppe_cb;
+        struct hnae_vf_cb *vf_cb;
+        int ret;
+        int i;
+
+        for (i = 0; i < handle->q_num; i++) {
+                ret = hns_rcb_wait_tx_ring_clean(handle->qs[i]);
+                if (ret)
+                        return ret;
+        }
+
+        ppe_cb = hns_get_ppe_cb(handle);
+        ret = hns_ppe_wait_tx_fifo_clean(ppe_cb);
+        if (ret)
+                return ret;
+
+        dsaf_dev = hns_ae_get_dsaf_dev(handle->dev);
+        if (!dsaf_dev)
+                return -EINVAL;
+        ret = hns_dsaf_wait_pkt_clean(dsaf_dev, handle->dport_id);
+        if (ret)
+                return ret;
+
+        vf_cb = hns_ae_get_vf_cb(handle);
+        ret = hns_mac_wait_fifo_clean(vf_cb->mac_cb);
+        if (ret)
+                return ret;
+
+        mdelay(10);
+        return 0;
+}
+
 static void hns_ae_ring_enable_all(struct hnae_handle *handle, int val)
 {
         int q_num = handle->q_num;
@@ -399,12 +434,41 @@ static int hns_ae_get_mac_info(struct hnae_handle *handle,
         return hns_mac_get_port_info(mac_cb, auto_neg, speed, duplex);
 }
 
+static bool hns_ae_need_adjust_link(struct hnae_handle *handle, int speed,
+                                    int duplex)
+{
+        struct hns_mac_cb *mac_cb = hns_get_mac_cb(handle);
+
+        return hns_mac_need_adjust_link(mac_cb, speed, duplex);
+}
+
 static void hns_ae_adjust_link(struct hnae_handle *handle, int speed,
                                int duplex)
 {
         struct hns_mac_cb *mac_cb = hns_get_mac_cb(handle);
 
-        hns_mac_adjust_link(mac_cb, speed, duplex);
+        switch (mac_cb->dsaf_dev->dsaf_ver) {
+        case AE_VERSION_1:
+                hns_mac_adjust_link(mac_cb, speed, duplex);
+                break;
+
+        case AE_VERSION_2:
+                /* chip need to clear all pkt inside */
+                hns_mac_disable(mac_cb, MAC_COMM_MODE_RX);
+                if (hns_ae_wait_flow_down(handle)) {
+                        hns_mac_enable(mac_cb, MAC_COMM_MODE_RX);
+                        break;
+                }
+
+                hns_mac_adjust_link(mac_cb, speed, duplex);
+                hns_mac_enable(mac_cb, MAC_COMM_MODE_RX);
+                break;
+
+        default:
+                break;
+        }
+
+        return;
 }
 
 static void hns_ae_get_ring_bdnum_limit(struct hnae_queue *queue,
@@ -902,6 +966,7 @@ static struct hnae_ae_ops hns_dsaf_ops = {
         .get_status = hns_ae_get_link_status,
         .get_info = hns_ae_get_mac_info,
         .adjust_link = hns_ae_adjust_link,
+        .need_adjust_link = hns_ae_need_adjust_link,
         .set_loopback = hns_ae_config_loopback,
         .get_ring_bdnum_limit = hns_ae_get_ring_bdnum_limit,
         .get_pauseparam = hns_ae_get_pauseparam,
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
index 5488c6e89f21..09e4061d1fa6 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
@@ -257,6 +257,16 @@ static void hns_gmac_get_pausefrm_cfg(void *mac_drv, u32 *rx_pause_en,
         *tx_pause_en = dsaf_get_bit(pause_en, GMAC_PAUSE_EN_TX_FDFC_B);
 }
 
+static bool hns_gmac_need_adjust_link(void *mac_drv, enum mac_speed speed,
+                                      int duplex)
+{
+        struct mac_driver *drv = (struct mac_driver *)mac_drv;
+        struct hns_mac_cb *mac_cb = drv->mac_cb;
+
+        return (mac_cb->speed != speed) ||
+                (mac_cb->half_duplex == duplex);
+}
+
 static int hns_gmac_adjust_link(void *mac_drv, enum mac_speed speed,
                                 u32 full_duplex)
 {
@@ -309,6 +319,30 @@ static void hns_gmac_set_promisc(void *mac_drv, u8 en)
                 hns_gmac_set_uc_match(mac_drv, en);
 }
 
+int hns_gmac_wait_fifo_clean(void *mac_drv)
+{
+        struct mac_driver *drv = (struct mac_driver *)mac_drv;
+        int wait_cnt;
+        u32 val;
+
+        wait_cnt = 0;
+        while (wait_cnt++ < HNS_MAX_WAIT_CNT) {
+                val = dsaf_read_dev(drv, GMAC_FIFO_STATE_REG);
+                /* bit5~bit0 is not send complete pkts */
+                if ((val & 0x3f) == 0)
+                        break;
+                usleep_range(100, 200);
+        }
+
+        if (wait_cnt >= HNS_MAX_WAIT_CNT) {
+                dev_err(drv->dev,
+                        "hns ge %d fifo was not idle.\n", drv->mac_id);
+                return -EBUSY;
+        }
+
+        return 0;
+}
+
 static void hns_gmac_init(void *mac_drv)
 {
         u32 port;
@@ -690,6 +724,7 @@ void *hns_gmac_config(struct hns_mac_cb *mac_cb, struct mac_params *mac_param)
         mac_drv->mac_disable = hns_gmac_disable;
         mac_drv->mac_free = hns_gmac_free;
         mac_drv->adjust_link = hns_gmac_adjust_link;
+        mac_drv->need_adjust_link = hns_gmac_need_adjust_link;
         mac_drv->set_tx_auto_pause_frames = hns_gmac_set_tx_auto_pause_frames;
         mac_drv->config_max_frame_length = hns_gmac_config_max_frame_length;
         mac_drv->mac_pausefrm_cfg = hns_gmac_pause_frm_cfg;
@@ -717,6 +752,7 @@ void *hns_gmac_config(struct hns_mac_cb *mac_cb, struct mac_params *mac_param)
         mac_drv->get_strings = hns_gmac_get_strings;
         mac_drv->update_stats = hns_gmac_update_stats;
         mac_drv->set_promiscuous = hns_gmac_set_promisc;
+        mac_drv->wait_fifo_clean = hns_gmac_wait_fifo_clean;
 
         return (void *)mac_drv;
 }
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
index 6521d8d53745..3613e400e816 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
@@ -114,6 +114,26 @@ int hns_mac_get_port_info(struct hns_mac_cb *mac_cb,
         return 0;
 }
 
+/**
+ *hns_mac_is_adjust_link - check is need change mac speed and duplex register
+ *@mac_cb: mac device
+ *@speed: phy device speed
+ *@duplex:phy device duplex
+ *
+ */
+bool hns_mac_need_adjust_link(struct hns_mac_cb *mac_cb, int speed, int duplex)
+{
+        struct mac_driver *mac_ctrl_drv;
+
+        mac_ctrl_drv = (struct mac_driver *)(mac_cb->priv.mac);
+
+        if (mac_ctrl_drv->need_adjust_link)
+                return mac_ctrl_drv->need_adjust_link(mac_ctrl_drv,
+                        (enum mac_speed)speed, duplex);
+        else
+                return true;
+}
+
 void hns_mac_adjust_link(struct hns_mac_cb *mac_cb, int speed, int duplex)
 {
         int ret;
@@ -430,6 +450,16 @@ int hns_mac_vm_config_bc_en(struct hns_mac_cb *mac_cb, u32 vmid, bool enable)
         return 0;
 }
 
+int hns_mac_wait_fifo_clean(struct hns_mac_cb *mac_cb)
+{
+        struct mac_driver *drv = hns_mac_get_drv(mac_cb);
+
+        if (drv->wait_fifo_clean)
+                return drv->wait_fifo_clean(drv);
+
+        return 0;
+}
+
 void hns_mac_reset(struct hns_mac_cb *mac_cb)
 {
         struct mac_driver *drv = hns_mac_get_drv(mac_cb);
@@ -998,6 +1028,20 @@ static int hns_mac_get_max_port_num(struct dsaf_device *dsaf_dev)
                 return  DSAF_MAX_PORT_NUM;
 }
 
+void hns_mac_enable(struct hns_mac_cb *mac_cb, enum mac_commom_mode mode)
+{
+        struct mac_driver *mac_ctrl_drv = hns_mac_get_drv(mac_cb);
+
+        mac_ctrl_drv->mac_enable(mac_cb->priv.mac, mode);
+}
+
+void hns_mac_disable(struct hns_mac_cb *mac_cb, enum mac_commom_mode mode)
+{
+        struct mac_driver *mac_ctrl_drv = hns_mac_get_drv(mac_cb);
+
+        mac_ctrl_drv->mac_disable(mac_cb->priv.mac, mode);
+}
+
 /**
  * hns_mac_init - init mac
  * @dsaf_dev: dsa fabric device struct pointer
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
index bbc0a98e7ca3..fbc75341bef7 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
@@ -356,6 +356,9 @@ struct mac_driver {
         /*adjust mac mode of port,include speed and duplex*/
         int (*adjust_link)(void *mac_drv, enum mac_speed speed,
                            u32 full_duplex);
+        /* need adjust link */
+        bool (*need_adjust_link)(void *mac_drv, enum mac_speed speed,
+                                 int duplex);
         /* config autoegotaite mode of port*/
         void (*set_an_mode)(void *mac_drv, u8 enable);
         /* config loopbank mode */
@@ -394,6 +397,7 @@ struct mac_driver {
         void (*get_info)(void *mac_drv, struct mac_info *mac_info);
 
         void (*update_stats)(void *mac_drv);
+        int (*wait_fifo_clean)(void *mac_drv);
 
         enum mac_mode mac_mode;
         u8 mac_id;
@@ -427,6 +431,7 @@ void *hns_xgmac_config(struct hns_mac_cb *mac_cb,
 
 int hns_mac_init(struct dsaf_device *dsaf_dev);
 void mac_adjust_link(struct net_device *net_dev);
+bool hns_mac_need_adjust_link(struct hns_mac_cb *mac_cb, int speed, int duplex);
 void hns_mac_get_link_status(struct hns_mac_cb *mac_cb, u32 *link_status);
 int hns_mac_change_vf_addr(struct hns_mac_cb *mac_cb, u32 vmid, char *addr);
 int hns_mac_set_multi(struct hns_mac_cb *mac_cb,
@@ -463,5 +468,8 @@ int hns_mac_add_uc_addr(struct hns_mac_cb *mac_cb, u8 vf_id,
 int hns_mac_rm_uc_addr(struct hns_mac_cb *mac_cb, u8 vf_id,
                        const unsigned char *addr);
 int hns_mac_clr_multicast(struct hns_mac_cb *mac_cb, int vfn);
+void hns_mac_enable(struct hns_mac_cb *mac_cb, enum mac_commom_mode mode);
+void hns_mac_disable(struct hns_mac_cb *mac_cb, enum mac_commom_mode mode);
+int hns_mac_wait_fifo_clean(struct hns_mac_cb *mac_cb);
 
 #endif /* _HNS_DSAF_MAC_H */
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
index ca50c2553a9c..e557a4ef5996 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
@@ -2727,6 +2727,35 @@ void hns_dsaf_set_promisc_tcam(struct dsaf_device *dsaf_dev,
         soft_mac_entry->index = enable ? entry_index : DSAF_INVALID_ENTRY_IDX;
 }
 
+int hns_dsaf_wait_pkt_clean(struct dsaf_device *dsaf_dev, int port)
+{
+        u32 val, val_tmp;
+        int wait_cnt;
+
+        if (port >= DSAF_SERVICE_NW_NUM)
+                return 0;
+
+        wait_cnt = 0;
+        while (wait_cnt++ < HNS_MAX_WAIT_CNT) {
+                val = dsaf_read_dev(dsaf_dev, DSAF_VOQ_IN_PKT_NUM_0_REG +
+                        (port + DSAF_XGE_NUM) * 0x40);
+                val_tmp = dsaf_read_dev(dsaf_dev, DSAF_VOQ_OUT_PKT_NUM_0_REG +
+                        (port + DSAF_XGE_NUM) * 0x40);
+                if (val == val_tmp)
+                        break;
+
+                usleep_range(100, 200);
+        }
+
+        if (wait_cnt >= HNS_MAX_WAIT_CNT) {
+                dev_err(dsaf_dev->dev, "hns dsaf clean wait timeout(%u - %u).\n",
+                        val, val_tmp);
+                return -EBUSY;
+        }
+
+        return 0;
+}
+
 /**
  * dsaf_probe - probo dsaf dev
  * @pdev: dasf platform device
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
index 4507e8222683..0e1cd99831a6 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
@@ -44,6 +44,8 @@ struct hns_mac_cb;
 #define DSAF_ROCE_CREDIT_CHN    8
 #define DSAF_ROCE_CHAN_MODE     3
 
+#define HNS_MAX_WAIT_CNT 10000
+
 enum dsaf_roce_port_mode {
         DSAF_ROCE_6PORT_MODE,
         DSAF_ROCE_4PORT_MODE,
@@ -463,5 +465,6 @@ int hns_dsaf_rm_mac_addr(
 
 int hns_dsaf_clr_mac_mc_port(struct dsaf_device *dsaf_dev,
                              u8 mac_id, u8 port_num);
+int hns_dsaf_wait_pkt_clean(struct dsaf_device *dsaf_dev, int port);
 
 #endif /* __HNS_DSAF_MAIN_H__ */
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c
index d160d8c9e45b..0942e4916d9d 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c
@@ -275,6 +275,29 @@ static void hns_ppe_exc_irq_en(struct hns_ppe_cb *ppe_cb, int en)
         dsaf_write_dev(ppe_cb, PPE_INTEN_REG, msk_vlue & vld_msk);
 }
 
+int hns_ppe_wait_tx_fifo_clean(struct hns_ppe_cb *ppe_cb)
+{
+        int wait_cnt;
+        u32 val;
+
+        wait_cnt = 0;
+        while (wait_cnt++ < HNS_MAX_WAIT_CNT) {
+                val = dsaf_read_dev(ppe_cb, PPE_CURR_TX_FIFO0_REG) & 0x3ffU;
+                if (!val)
+                        break;
+
+                usleep_range(100, 200);
+        }
+
+        if (wait_cnt >= HNS_MAX_WAIT_CNT) {
+                dev_err(ppe_cb->dev, "hns ppe tx fifo clean wait timeout, still has %u pkt.\n",
+                        val);
+                return -EBUSY;
+        }
+
+        return 0;
+}
+
 /**
  * ppe_init_hw - init ppe
  * @ppe_cb: ppe device
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h
index 9d8e643e8aa6..f670e63a5a01 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h
@@ -100,6 +100,7 @@ struct ppe_common_cb {
 
 };
 
+int hns_ppe_wait_tx_fifo_clean(struct hns_ppe_cb *ppe_cb);
 int hns_ppe_init(struct dsaf_device *dsaf_dev);
 
 void hns_ppe_uninit(struct dsaf_device *dsaf_dev);
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
index 9d76e2e54f9d..5d64519b9b1d 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
@@ -66,6 +66,29 @@ void hns_rcb_wait_fbd_clean(struct hnae_queue **qs, int q_num, u32 flag)
                         "queue(%d) wait fbd(%d) clean fail!!\n", i, fbd_num);
 }
 
+int hns_rcb_wait_tx_ring_clean(struct hnae_queue *qs)
+{
+        u32 head, tail;
+        int wait_cnt;
+
+        tail = dsaf_read_dev(&qs->tx_ring, RCB_REG_TAIL);
+        wait_cnt = 0;
+        while (wait_cnt++ < HNS_MAX_WAIT_CNT) {
+                head = dsaf_read_dev(&qs->tx_ring, RCB_REG_HEAD);
+                if (tail == head)
+                        break;
+
+                usleep_range(100, 200);
+        }
+
+        if (wait_cnt >= HNS_MAX_WAIT_CNT) {
+                dev_err(qs->dev->dev, "rcb wait timeout, head not equal to tail.\n");
+                return -EBUSY;
+        }
+
+        return 0;
+}
+
 /**
  *hns_rcb_reset_ring_hw - ring reset
  *@q: ring struct pointer
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
index 602816498c8d..2319b772a271 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
@@ -136,6 +136,7 @@ void hns_rcbv2_int_clr_hw(struct hnae_queue *q, u32 flag);
 void hns_rcb_init_hw(struct ring_pair_cb *ring);
 void hns_rcb_reset_ring_hw(struct hnae_queue *q);
 void hns_rcb_wait_fbd_clean(struct hnae_queue **qs, int q_num, u32 flag);
+int hns_rcb_wait_tx_ring_clean(struct hnae_queue *qs);
 u32 hns_rcb_get_rx_coalesced_frames(
         struct rcb_common_cb *rcb_common, u32 port_idx);
 u32 hns_rcb_get_tx_coalesced_frames(
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
index 886cbbf25761..74d935d82cbc 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
@@ -464,6 +464,7 @@
 #define RCB_RING_INTMSK_TX_OVERTIME_REG         0x000C4
 #define RCB_RING_INTSTS_TX_OVERTIME_REG         0x000C8
 
+#define GMAC_FIFO_STATE_REG                     0x0000UL
 #define GMAC_DUPLEX_TYPE_REG                    0x0008UL
 #define GMAC_FD_FC_TYPE_REG                     0x000CUL
 #define GMAC_TX_WATER_LINE_REG                  0x0010UL
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index 02a0ba20fad5..f56855e63c96 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -1112,11 +1112,26 @@ static void hns_nic_adjust_link(struct net_device *ndev)
         struct hnae_handle *h = priv->ae_handle;
         int state = 1;
 
+        /* If there is no phy, do not need adjust link */
         if (ndev->phydev) {
-                h->dev->ops->adjust_link(h, ndev->phydev->speed,
-                                         ndev->phydev->duplex);
-                state = ndev->phydev->link;
+                /* When phy link down, do nothing */
+                if (ndev->phydev->link == 0)
+                        return;
+
+                if (h->dev->ops->need_adjust_link(h, ndev->phydev->speed,
+                                                  ndev->phydev->duplex)) {
+                        /* because Hi161X chip don't support to change gmac
+                         * speed and duplex with traffic. Delay 200ms to
+                         * make sure there is no more data in chip FIFO.
+                         */
+                        netif_carrier_off(ndev);
+                        msleep(200);
+                        h->dev->ops->adjust_link(h, ndev->phydev->speed,
+                                                 ndev->phydev->duplex);
+                        netif_carrier_on(ndev);
+                }
         }
+
         state = state && h->dev->ops->get_status(h);
 
         if (state != priv->link) {
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
index 08f3c4743f74..774beda040a1 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -243,7 +243,9 @@ static int hns_nic_set_link_ksettings(struct net_device *net_dev,
         }
 
         if (h->dev->ops->adjust_link) {
+                netif_carrier_off(net_dev);
                 h->dev->ops->adjust_link(h, (int)speed, cmd->base.duplex);
+                netif_carrier_on(net_dev);
                 return 0;
         }
 
diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index 354c0982847b..372664686309 100644
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -494,9 +494,6 @@ static u32 __emac_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_s
         case 16384:
                 ret |= EMAC_MR1_RFS_16K;
                 break;
-        case 8192:
-                ret |= EMAC4_MR1_RFS_8K;
-                break;
         case 4096:
                 ret |= EMAC_MR1_RFS_4K;
                 break;
@@ -537,6 +534,9 @@ static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_
         case 16384:
                 ret |= EMAC4_MR1_RFS_16K;
                 break;
+        case 8192:
+                ret |= EMAC4_MR1_RFS_8K;
+                break;
         case 4096:
                 ret |= EMAC4_MR1_RFS_4K;
                 break;
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index dafdd4ade705..4f0daf67b18d 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1823,11 +1823,17 @@ static int do_reset(struct ibmvnic_adapter *adapter,
                         adapter->map_id = 1;
                         release_rx_pools(adapter);
                         release_tx_pools(adapter);
-                        init_rx_pools(netdev);
-                        init_tx_pools(netdev);
+                        rc = init_rx_pools(netdev);
+                        if (rc)
+                                return rc;
+                        rc = init_tx_pools(netdev);
+                        if (rc)
+                                return rc;
 
                         release_napi(adapter);
-                        init_napi(adapter);
+                        rc = init_napi(adapter);
+                        if (rc)
+                                return rc;
                 } else {
                         rc = reset_tx_pools(adapter);
                         if (rc)
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 32d785b616e1..28500417843e 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -4803,6 +4803,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,
         dev->min_mtu = ETH_MIN_MTU;
         /* 9704 == 9728 - 20 and rounding to 8 */
         dev->max_mtu = MVPP2_BM_JUMBO_PKT_SIZE;
+        dev->dev.of_node = port_node;
 
         /* Phylink isn't used w/ ACPI as of now */
         if (port_node) {
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wq.c b/drivers/net/ethernet/mellanox/mlx5/core/wq.c
index 86478a6b99c5..c8c315eb5128 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/wq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/wq.c
@@ -139,14 +139,15 @@ int mlx5_wq_qp_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,
                       struct mlx5_wq_ctrl *wq_ctrl)
 {
         u32 sq_strides_offset;
+        u32 rq_pg_remainder;
         int err;
 
         mlx5_fill_fbc(MLX5_GET(qpc, qpc, log_rq_stride) + 4,
                       MLX5_GET(qpc, qpc, log_rq_size),
                       &wq->rq.fbc);
 
-        sq_strides_offset =
-                ((wq->rq.fbc.frag_sz_m1 + 1) % PAGE_SIZE) / MLX5_SEND_WQE_BB;
+        rq_pg_remainder   = mlx5_wq_cyc_get_byte_size(&wq->rq) % PAGE_SIZE;
+        sq_strides_offset = rq_pg_remainder / MLX5_SEND_WQE_BB;
 
         mlx5_fill_fbc_offset(ilog2(MLX5_SEND_WQE_BB),
                              MLX5_GET(qpc, qpc, log_sq_size),
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index a8b9fbab5f73..253bdaef1505 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -229,29 +229,16 @@ done:
         spin_unlock_bh(&nn->reconfig_lock);
 }
 
-/**
- * nfp_net_reconfig() - Reconfigure the firmware
- * @nn:      NFP Net device to reconfigure
- * @update:  The value for the update field in the BAR config
- *
- * Write the update word to the BAR and ping the reconfig queue.  The
- * poll until the firmware has acknowledged the update by zeroing the
- * update word.
- *
- * Return: Negative errno on error, 0 on success
- */
-int nfp_net_reconfig(struct nfp_net *nn, u32 update)
+static void nfp_net_reconfig_sync_enter(struct nfp_net *nn)
 {
         bool cancelled_timer = false;
         u32 pre_posted_requests;
-        int ret;
 
         spin_lock_bh(&nn->reconfig_lock);
 
         nn->reconfig_sync_present = true;
 
         if (nn->reconfig_timer_active) {
-                del_timer(&nn->reconfig_timer);
                 nn->reconfig_timer_active = false;
                 cancelled_timer = true;
         }
@@ -260,14 +247,43 @@ int nfp_net_reconfig(struct nfp_net *nn, u32 update)
 
         spin_unlock_bh(&nn->reconfig_lock);
 
-        if (cancelled_timer)
+        if (cancelled_timer) {
+                del_timer_sync(&nn->reconfig_timer);
                 nfp_net_reconfig_wait(nn, nn->reconfig_timer.expires);
+        }
 
         /* Run the posted reconfigs which were issued before we started */
         if (pre_posted_requests) {
                 nfp_net_reconfig_start(nn, pre_posted_requests);
                 nfp_net_reconfig_wait(nn, jiffies + HZ * NFP_NET_POLL_TIMEOUT);
         }
+}
+
+static void nfp_net_reconfig_wait_posted(struct nfp_net *nn)
+{
+        nfp_net_reconfig_sync_enter(nn);
+
+        spin_lock_bh(&nn->reconfig_lock);
+        nn->reconfig_sync_present = false;
+        spin_unlock_bh(&nn->reconfig_lock);
+}
+
+/**
+ * nfp_net_reconfig() - Reconfigure the firmware
+ * @nn:      NFP Net device to reconfigure
+ * @update:  The value for the update field in the BAR config
+ *
+ * Write the update word to the BAR and ping the reconfig queue.  The
+ * poll until the firmware has acknowledged the update by zeroing the
+ * update word.
+ *
+ * Return: Negative errno on error, 0 on success
+ */
+int nfp_net_reconfig(struct nfp_net *nn, u32 update)
+{
+        int ret;
+
+        nfp_net_reconfig_sync_enter(nn);
 
         nfp_net_reconfig_start(nn, update);
         ret = nfp_net_reconfig_wait(nn, jiffies + HZ * NFP_NET_POLL_TIMEOUT);
@@ -3633,6 +3649,7 @@ struct nfp_net *nfp_net_alloc(struct pci_dev *pdev, bool needs_netdev,
  */
 void nfp_net_free(struct nfp_net *nn)
 {
+        WARN_ON(timer_pending(&nn->reconfig_timer) || nn->reconfig_posted);
         if (nn->dp.netdev)
                 free_netdev(nn->dp.netdev);
         else
@@ -3920,4 +3937,5 @@ void nfp_net_clean(struct nfp_net *nn)
                 return;
 
         unregister_netdev(nn->dp.netdev);
+        nfp_net_reconfig_wait_posted(nn);
 }
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 0efa977c422d..b08d51bf7a20 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -218,6 +218,7 @@ static const struct pci_device_id rtl8169_pci_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8161), 0, 0, RTL_CFG_1 },
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8167), 0, 0, RTL_CFG_0 },
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8168), 0, 0, RTL_CFG_1 },
+        { PCI_DEVICE(PCI_VENDOR_ID_NCUBE,       0x8168), 0, 0, RTL_CFG_1 },
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8169), 0, 0, RTL_CFG_0 },
         { PCI_VENDOR_ID_DLINK,                  0x4300,
                 PCI_VENDOR_ID_DLINK, 0x4b10,             0, 0, RTL_CFG_1 },
@@ -4522,7 +4523,7 @@ static void rtl8169_hw_reset(struct rtl8169_private *tp)
         rtl_hw_reset(tp);
 }
 
-static void rtl_set_rx_tx_config_registers(struct rtl8169_private *tp)
+static void rtl_set_tx_config_registers(struct rtl8169_private *tp)
 {
         /* Set DMA burst size and Interframe Gap Time */
         RTL_W32(tp, TxConfig, (TX_DMA_BURST << TxDMAShift) |
@@ -4633,12 +4634,14 @@ static void rtl_hw_start(struct  rtl8169_private *tp)
 
         rtl_set_rx_max_size(tp);
         rtl_set_rx_tx_desc_registers(tp);
-        rtl_set_rx_tx_config_registers(tp);
+        rtl_set_tx_config_registers(tp);
         RTL_W8(tp, Cfg9346, Cfg9346_Lock);
 
         /* Initially a 10 us delay. Turned it into a PCI commit. - FR */
         RTL_R8(tp, IntrMask);
         RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb);
+        rtl_init_rxcfg(tp);
+
         rtl_set_rx_mode(tp->dev);
         /* no early-rx interrupts */
         RTL_W16(tp, MultiIntr, RTL_R16(tp, MultiIntr) & 0xf000);
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index ad4433d59237..f27a0dc8c563 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -798,6 +798,41 @@ static struct sh_eth_cpu_data r8a77980_data = {
         .magic          = 1,
         .cexcr          = 1,
 };
+
+/* R7S9210 */
+static struct sh_eth_cpu_data r7s9210_data = {
+        .soft_reset     = sh_eth_soft_reset,
+
+        .set_duplex     = sh_eth_set_duplex,
+        .set_rate       = sh_eth_set_rate_rcar,
+
+        .register_type  = SH_ETH_REG_FAST_SH4,
+
+        .edtrr_trns     = EDTRR_TRNS_ETHER,
+        .ecsr_value     = ECSR_ICD,
+        .ecsipr_value   = ECSIPR_ICDIP,
+        .eesipr_value   = EESIPR_TWBIP | EESIPR_TABTIP | EESIPR_RABTIP |
+                          EESIPR_RFCOFIP | EESIPR_ECIIP | EESIPR_FTCIP |
+                          EESIPR_TDEIP | EESIPR_TFUFIP | EESIPR_FRIP |
+                          EESIPR_RDEIP | EESIPR_RFOFIP | EESIPR_CNDIP |
+                          EESIPR_DLCIP | EESIPR_CDIP | EESIPR_TROIP |
+                          EESIPR_RMAFIP | EESIPR_RRFIP | EESIPR_RTLFIP |
+                          EESIPR_RTSFIP | EESIPR_PREIP | EESIPR_CERFIP,
+
+        .tx_check       = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_TRO,
+        .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RFE |
+                          EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE,
+
+        .fdr_value      = 0x0000070f,
+
+        .apr            = 1,
+        .mpr            = 1,
+        .tpauser        = 1,
+        .hw_swap        = 1,
+        .rpadir         = 1,
+        .no_ade         = 1,
+        .xdfar_rw       = 1,
+};
 #endif /* CONFIG_OF */
 
 static void sh_eth_set_rate_sh7724(struct net_device *ndev)
@@ -3121,6 +3156,7 @@ static const struct of_device_id sh_eth_match_table[] = {
         { .compatible = "renesas,ether-r8a7794", .data = &rcar_gen2_data },
         { .compatible = "renesas,gether-r8a77980", .data = &r8a77980_data },
         { .compatible = "renesas,ether-r7s72100", .data = &r7s72100_data },
+        { .compatible = "renesas,ether-r7s9210", .data = &r7s9210_data },
         { .compatible = "renesas,rcar-gen1-ether", .data = &rcar_gen1_data },
         { .compatible = "renesas,rcar-gen2-ether", .data = &rcar_gen2_data },
         { }
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index bf4acebb6bcd..324049eebb9b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -110,7 +110,7 @@ config DWMAC_ROCKCHIP
 
 config DWMAC_SOCFPGA
         tristate "SOCFPGA dwmac support"
-        default ARCH_SOCFPGA
+        default (ARCH_SOCFPGA || ARCH_STRATIX10)
         depends on OF && (ARCH_SOCFPGA || ARCH_STRATIX10 || COMPILE_TEST)
         select MFD_SYSCON
         help
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index 76649adf8fb0..c0a855b7ab3b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -112,7 +112,6 @@ struct stmmac_priv {
         u32 tx_count_frames;
         u32 tx_coal_frames;
         u32 tx_coal_timer;
-        bool tx_timer_armed;
 
         int tx_coalesce;
         int hwts_tx_en;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index ff1ffb46198a..9f458bb16f2a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3147,16 +3147,13 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
          * element in case of no SG.
          */
         priv->tx_count_frames += nfrags + 1;
-        if (likely(priv->tx_coal_frames > priv->tx_count_frames) &&
-            !priv->tx_timer_armed) {
+        if (likely(priv->tx_coal_frames > priv->tx_count_frames)) {
                 mod_timer(&priv->txtimer,
                           STMMAC_COAL_TIMER(priv->tx_coal_timer));
-                priv->tx_timer_armed = true;
         } else {
                 priv->tx_count_frames = 0;
                 stmmac_set_tx_ic(priv, desc);
                 priv->xstats.tx_set_ic_bit++;
-                priv->tx_timer_armed = false;
         }
 
         skb_tx_timestamp(skb);
diff --git a/drivers/net/ethernet/ti/cpsw-phy-sel.c b/drivers/net/ethernet/ti/cpsw-phy-sel.c
index 0c1adad7415d..396e1cd10667 100644
--- a/drivers/net/ethernet/ti/cpsw-phy-sel.c
+++ b/drivers/net/ethernet/ti/cpsw-phy-sel.c
@@ -170,10 +170,13 @@ void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave)
         struct device_node *node;
         struct cpsw_phy_sel_priv *priv;
 
-        node = of_get_child_by_name(dev->of_node, "cpsw-phy-sel");
+        node = of_parse_phandle(dev->of_node, "cpsw-phy-sel", 0);
         if (!node) {
-                dev_err(dev, "Phy mode driver DT not found\n");
-                return;
+                node = of_get_child_by_name(dev->of_node, "cpsw-phy-sel");
+                if (!node) {
+                        dev_err(dev, "Phy mode driver DT not found\n");
+                        return;
+                }
         }
 
         dev = bus_find_device(&platform_bus_type, NULL, node, match);
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 1121a1ec407c..70921bbe0e28 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -2206,6 +2206,16 @@ static int netvsc_probe(struct hv_device *dev,
 
         memcpy(net->dev_addr, device_info.mac_adr, ETH_ALEN);
 
+        /* We must get rtnl lock before scheduling nvdev->subchan_work,
+         * otherwise netvsc_subchan_work() can get rtnl lock first and wait
+         * all subchannels to show up, but that may not happen because
+         * netvsc_probe() can't get rtnl lock and as a result vmbus_onoffer()
+         * -> ... -> device_add() -> ... -> __device_attach() can't get
+         * the device lock, so all the subchannels can't be processed --
+         * finally netvsc_subchan_work() hangs for ever.
+         */
+        rtnl_lock();
+
         if (nvdev->num_chn > 1)
                 schedule_work(&nvdev->subchan_work);
 
@@ -2224,7 +2234,6 @@ static int netvsc_probe(struct hv_device *dev,
         else
                 net->max_mtu = ETH_DATA_LEN;
 
-        rtnl_lock();
         ret = register_netdevice(net);
         if (ret != 0) {
                 pr_err("Unable to register netdev.\n");
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 4637d980310e..52fffb98fde9 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -398,7 +398,6 @@ static umode_t sfp_hwmon_is_visible(const void *data,
         switch (type) {
         case hwmon_temp:
                 switch (attr) {
-                case hwmon_temp_input:
                 case hwmon_temp_min_alarm:
                 case hwmon_temp_max_alarm:
                 case hwmon_temp_lcrit_alarm:
@@ -407,13 +406,16 @@ static umode_t sfp_hwmon_is_visible(const void *data,
                 case hwmon_temp_max:
                 case hwmon_temp_lcrit:
                 case hwmon_temp_crit:
+                        if (!(sfp->id.ext.enhopts & SFP_ENHOPTS_ALARMWARN))
+                                return 0;
+                        /* fall through */
+                case hwmon_temp_input:
                         return 0444;
                 default:
                         return 0;
                 }
         case hwmon_in:
                 switch (attr) {
-                case hwmon_in_input:
                 case hwmon_in_min_alarm:
                 case hwmon_in_max_alarm:
                 case hwmon_in_lcrit_alarm:
@@ -422,13 +424,16 @@ static umode_t sfp_hwmon_is_visible(const void *data,
                 case hwmon_in_max:
                 case hwmon_in_lcrit:
                 case hwmon_in_crit:
+                        if (!(sfp->id.ext.enhopts & SFP_ENHOPTS_ALARMWARN))
+                                return 0;
+                        /* fall through */
+                case hwmon_in_input:
                         return 0444;
                 default:
                         return 0;
                 }
         case hwmon_curr:
                 switch (attr) {
-                case hwmon_curr_input:
                 case hwmon_curr_min_alarm:
                 case hwmon_curr_max_alarm:
                 case hwmon_curr_lcrit_alarm:
@@ -437,6 +442,10 @@ static umode_t sfp_hwmon_is_visible(const void *data,
                 case hwmon_curr_max:
                 case hwmon_curr_lcrit:
                 case hwmon_curr_crit:
+                        if (!(sfp->id.ext.enhopts & SFP_ENHOPTS_ALARMWARN))
+                                return 0;
+                        /* fall through */
+                case hwmon_curr_input:
                         return 0444;
                 default:
                         return 0;
@@ -452,7 +461,6 @@ static umode_t sfp_hwmon_is_visible(const void *data,
                     channel == 1)
                         return 0;
                 switch (attr) {
-                case hwmon_power_input:
                 case hwmon_power_min_alarm:
                 case hwmon_power_max_alarm:
                 case hwmon_power_lcrit_alarm:
@@ -461,6 +469,10 @@ static umode_t sfp_hwmon_is_visible(const void *data,
                 case hwmon_power_max:
                 case hwmon_power_lcrit:
                 case hwmon_power_crit:
+                        if (!(sfp->id.ext.enhopts & SFP_ENHOPTS_ALARMWARN))
+                                return 0;
+                        /* fall through */
+                case hwmon_power_input:
                         return 0444;
                 default:
                         return 0;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index b4c3a957c102..73969dbeb5c5 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -985,15 +985,12 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
         const u8 *nvm_chan = cfg->nvm_type == IWL_NVM_EXT ?
                              iwl_ext_nvm_channels : iwl_nvm_channels;
         struct ieee80211_regdomain *regd, *copy_rd;
-        int size_of_regd, regd_to_copy, wmms_to_copy;
-        int size_of_wmms = 0;
+        int size_of_regd, regd_to_copy;
         struct ieee80211_reg_rule *rule;
-        struct ieee80211_wmm_rule *wmm_rule, *d_wmm, *s_wmm;
         struct regdb_ptrs *regdb_ptrs;
         enum nl80211_band band;
         int center_freq, prev_center_freq = 0;
-        int valid_rules = 0, n_wmms = 0;
-        int i;
+        int valid_rules = 0;
         bool new_rule;
         int max_num_ch = cfg->nvm_type == IWL_NVM_EXT ?
                          IWL_NVM_NUM_CHANNELS_EXT : IWL_NVM_NUM_CHANNELS;
@@ -1012,11 +1009,7 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
                 sizeof(struct ieee80211_regdomain) +
                 num_of_ch * sizeof(struct ieee80211_reg_rule);
 
-        if (geo_info & GEO_WMM_ETSI_5GHZ_INFO)
-                size_of_wmms =
-                        num_of_ch * sizeof(struct ieee80211_wmm_rule);
-
-        regd = kzalloc(size_of_regd + size_of_wmms, GFP_KERNEL);
+        regd = kzalloc(size_of_regd, GFP_KERNEL);
         if (!regd)
                 return ERR_PTR(-ENOMEM);
 
@@ -1030,8 +1023,6 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
         regd->alpha2[0] = fw_mcc >> 8;
         regd->alpha2[1] = fw_mcc & 0xff;
 
-        wmm_rule = (struct ieee80211_wmm_rule *)((u8 *)regd + size_of_regd);
-
         for (ch_idx = 0; ch_idx < num_of_ch; ch_idx++) {
                 ch_flags = (u16)__le32_to_cpup(channels + ch_idx);
                 band = (ch_idx < NUM_2GHZ_CHANNELS) ?
@@ -1085,26 +1076,10 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
                     band == NL80211_BAND_2GHZ)
                         continue;
 
-                if (!reg_query_regdb_wmm(regd->alpha2, center_freq,
-                                         &regdb_ptrs[n_wmms].token, wmm_rule)) {
-                        /* Add only new rules */
-                        for (i = 0; i < n_wmms; i++) {
-                                if (regdb_ptrs[i].token ==
-                                    regdb_ptrs[n_wmms].token) {
-                                        rule->wmm_rule = regdb_ptrs[i].rule;
-                                        break;
-                                }
-                        }
-                        if (i == n_wmms) {
-                                rule->wmm_rule = wmm_rule;
-                                regdb_ptrs[n_wmms++].rule = wmm_rule;
-                                wmm_rule++;
-                        }
-                }
+                reg_query_regdb_wmm(regd->alpha2, center_freq, rule);
         }
 
         regd->n_reg_rules = valid_rules;
-        regd->n_wmm_rules = n_wmms;
 
         /*
          * Narrow down regdom for unused regulatory rules to prevent hole
@@ -1113,28 +1088,13 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
         regd_to_copy = sizeof(struct ieee80211_regdomain) +
                 valid_rules * sizeof(struct ieee80211_reg_rule);
 
-        wmms_to_copy = sizeof(struct ieee80211_wmm_rule) * n_wmms;
-
-        copy_rd = kzalloc(regd_to_copy + wmms_to_copy, GFP_KERNEL);
+        copy_rd = kzalloc(regd_to_copy, GFP_KERNEL);
         if (!copy_rd) {
                 copy_rd = ERR_PTR(-ENOMEM);
                 goto out;
         }
 
         memcpy(copy_rd, regd, regd_to_copy);
-        memcpy((u8 *)copy_rd + regd_to_copy, (u8 *)regd + size_of_regd,
-               wmms_to_copy);
-
-        d_wmm = (struct ieee80211_wmm_rule *)((u8 *)copy_rd + regd_to_copy);
-        s_wmm = (struct ieee80211_wmm_rule *)((u8 *)regd + size_of_regd);
-
-        for (i = 0; i < regd->n_reg_rules; i++) {
-                if (!regd->reg_rules[i].wmm_rule)
-                        continue;
-
-                copy_rd->reg_rules[i].wmm_rule = d_wmm +
-                        (regd->reg_rules[i].wmm_rule - s_wmm);
-        }
 
 out:
         kfree(regdb_ptrs);
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 998dfac0fcff..1068757ec42e 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -34,6 +34,7 @@
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
 #include <linux/rhashtable.h>
+#include <linux/nospec.h>
 #include "mac80211_hwsim.h"
 
 #define WARN_QUEUE 100
@@ -2820,9 +2821,6 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
                                 IEEE80211_VHT_CAP_SHORT_GI_80 |
                                 IEEE80211_VHT_CAP_SHORT_GI_160 |
                                 IEEE80211_VHT_CAP_TXSTBC |
-                                IEEE80211_VHT_CAP_RXSTBC_1 |
-                                IEEE80211_VHT_CAP_RXSTBC_2 |
-                                IEEE80211_VHT_CAP_RXSTBC_3 |
                                 IEEE80211_VHT_CAP_RXSTBC_4 |
                                 IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;
                         sband->vht_cap.vht_mcs.rx_mcs_map =
@@ -3317,6 +3315,11 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info)
         if (info->attrs[HWSIM_ATTR_CHANNELS])
                 param.channels = nla_get_u32(info->attrs[HWSIM_ATTR_CHANNELS]);
 
+        if (param.channels < 1) {
+                GENL_SET_ERR_MSG(info, "must have at least one channel");
+                return -EINVAL;
+        }
+
         if (param.channels > CFG80211_MAX_NUM_DIFFERENT_CHANNELS) {
                 GENL_SET_ERR_MSG(info, "too many channels specified");
                 return -EINVAL;
@@ -3350,6 +3353,9 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info)
                         kfree(hwname);
                         return -EINVAL;
                 }
+
+                idx = array_index_nospec(idx,
+                                         ARRAY_SIZE(hwsim_world_regdom_custom));
                 param.regd = hwsim_world_regdom_custom[idx];
         }
 
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 1b9951d2067e..d668682f91df 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -316,6 +316,14 @@ static bool nvme_dbbuf_update_and_check_event(u16 value, u32 *dbbuf_db,
                 old_value = *dbbuf_db;
                 *dbbuf_db = value;
 
+                /*
+                 * Ensure that the doorbell is updated before reading the event
+                 * index from memory.  The controller needs to provide similar
+                 * ordering to ensure the envent index is updated before reading
+                 * the doorbell.
+                 */
+                mb();
+
                 if (!nvme_dbbuf_need_event(*dbbuf_ei, value, old_value))
                         return false;
         }
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index ebf3e7a6c49e..b5ec96abd048 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -1210,7 +1210,7 @@ static int __init nvmet_init(void)
 
         error = nvmet_init_discovery();
         if (error)
-                goto out;
+                goto out_free_work_queue;
 
         error = nvmet_init_configfs();
         if (error)
@@ -1219,6 +1219,8 @@ static int __init nvmet_init(void)
 
 out_exit_discovery:
         nvmet_exit_discovery();
+out_free_work_queue:
+        destroy_workqueue(buffered_io_wq);
 out:
         return error;
 }
diff --git a/drivers/nvme/target/fcloop.c b/drivers/nvme/target/fcloop.c
index 34712def81b1..5251689a1d9a 100644
--- a/drivers/nvme/target/fcloop.c
+++ b/drivers/nvme/target/fcloop.c
@@ -311,7 +311,7 @@ fcloop_tgt_lsrqst_done_work(struct work_struct *work)
         struct fcloop_tport *tport = tls_req->tport;
         struct nvmefc_ls_req *lsreq = tls_req->lsreq;
 
-        if (tport->remoteport)
+        if (!tport || tport->remoteport)
                 lsreq->done(lsreq, tls_req->status);
 }
 
@@ -329,6 +329,7 @@ fcloop_ls_req(struct nvme_fc_local_port *localport,
 
         if (!rport->targetport) {
                 tls_req->status = -ECONNREFUSED;
+                tls_req->tport = NULL;
                 schedule_work(&tls_req->work);
                 return ret;
         }
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 466e3c8582f0..9095b8290150 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -54,6 +54,28 @@ DEFINE_MUTEX(of_mutex);
  */
 DEFINE_RAW_SPINLOCK(devtree_lock);
 
+bool of_node_name_eq(const struct device_node *np, const char *name)
+{
+        const char *node_name;
+        size_t len;
+
+        if (!np)
+                return false;
+
+        node_name = kbasename(np->full_name);
+        len = strchrnul(node_name, '@') - node_name;
+
+        return (strlen(name) == len) && (strncmp(node_name, name, len) == 0);
+}
+
+bool of_node_name_prefix(const struct device_node *np, const char *prefix)
+{
+        if (!np)
+                return false;
+
+        return strncmp(kbasename(np->full_name), prefix, strlen(prefix)) == 0;
+}
+
 int of_n_addr_cells(struct device_node *np)
 {
         u32 cells;
@@ -720,6 +742,31 @@ struct device_node *of_get_next_available_child(const struct device_node *node,
 EXPORT_SYMBOL(of_get_next_available_child);
 
 /**
+ * of_get_compatible_child - Find compatible child node
+ * @parent:     parent node
+ * @compatible: compatible string
+ *
+ * Lookup child node whose compatible property contains the given compatible
+ * string.
+ *
+ * Returns a node pointer with refcount incremented, use of_node_put() on it
+ * when done; or NULL if not found.
+ */
+struct device_node *of_get_compatible_child(const struct device_node *parent,
+                                const char *compatible)
+{
+        struct device_node *child;
+
+        for_each_child_of_node(parent, child) {
+                if (of_device_is_compatible(child, compatible))
+                        break;
+        }
+
+        return child;
+}
+EXPORT_SYMBOL(of_get_compatible_child);
+
+/**
  *      of_get_child_by_name - Find the child node by name for a given parent
  *      @node:  parent node
  *      @name:  child name to look for.
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 7ba90c290a42..6c59673933e9 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -241,6 +241,10 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
         if (!dev)
                 goto err_clear_flag;
 
+        /* AMBA devices only support a single DMA mask */
+        dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+        dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
+
         /* setup generic device info */
         dev->dev.of_node = of_node_get(node);
         dev->dev.fwnode = &node->fwnode;
diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
index 977a8307fbb1..4f2816559205 100644
--- a/drivers/thermal/of-thermal.c
+++ b/drivers/thermal/of-thermal.c
@@ -260,10 +260,13 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz,
 
         mutex_lock(&tz->lock);
 
-        if (mode == THERMAL_DEVICE_ENABLED)
+        if (mode == THERMAL_DEVICE_ENABLED) {
                 tz->polling_delay = data->polling_delay;
-        else
+                tz->passive_delay = data->passive_delay;
+        } else {
                 tz->polling_delay = 0;
+                tz->passive_delay = 0;
+        }
 
         mutex_unlock(&tz->lock);
 
diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
index c866cc165960..450ed66edf58 100644
--- a/drivers/thermal/qoriq_thermal.c
+++ b/drivers/thermal/qoriq_thermal.c
@@ -1,16 +1,6 @@
-/*
- * Copyright 2016 Freescale Semiconductor, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright 2016 Freescale Semiconductor, Inc.
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -197,7 +187,7 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
         int ret;
         struct qoriq_tmu_data *data;
         struct device_node *np = pdev->dev.of_node;
-        u32 site = 0;
+        u32 site;
 
         if (!np) {
                 dev_err(&pdev->dev, "Device OF-Node is NULL");
@@ -233,8 +223,9 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
         if (ret < 0)
                 goto err_tmu;
 
-        data->tz = thermal_zone_of_sensor_register(&pdev->dev, data->sensor_id,
-                                data, &tmu_tz_ops);
+        data->tz = devm_thermal_zone_of_sensor_register(&pdev->dev,
+                                                        data->sensor_id,
+                                                        data, &tmu_tz_ops);
         if (IS_ERR(data->tz)) {
                 ret = PTR_ERR(data->tz);
                 dev_err(&pdev->dev,
@@ -243,7 +234,7 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
         }
 
         /* Enable monitoring */
-        site |= 0x1 << (15 - data->sensor_id);
+        site = 0x1 << (15 - data->sensor_id);
         tmu_write(data, site | TMR_ME | TMR_ALPF, &data->regs->tmr);
 
         return 0;
@@ -261,8 +252,6 @@ static int qoriq_tmu_remove(struct platform_device *pdev)
 {
         struct qoriq_tmu_data *data = platform_get_drvdata(pdev);
 
-        thermal_zone_of_sensor_unregister(&pdev->dev, data->tz);
-
         /* Disable monitoring */
         tmu_write(data, TMR_DISABLE, &data->regs->tmr);
 
diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c
index 766521eb7071..7aed5337bdd3 100644
--- a/drivers/thermal/rcar_gen3_thermal.c
+++ b/drivers/thermal/rcar_gen3_thermal.c
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  R-Car Gen3 THS thermal sensor driver
  *  Based on rcar_thermal.c and work from Hien Dang and Khiem Nguyen.
  *
  * Copyright (C) 2016 Renesas Electronics Corporation.
  * Copyright (C) 2016 Sang Engineering
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
  */
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index e77e63070e99..78f932822d38 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  R-Car THS/TSC thermal sensor driver
  *
  * Copyright (C) 2012 Renesas Solutions Corp.
  * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 #include <linux/delay.h>
 #include <linux/err.h>
@@ -660,6 +648,6 @@ static struct platform_driver rcar_thermal_driver = {
 };
 module_platform_driver(rcar_thermal_driver);
 
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("R-Car THS/TSC thermal sensor driver");
 MODULE_AUTHOR("Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>");
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index f2088838f690..5b471889d723 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -402,10 +402,19 @@ static ssize_t modalias_show(struct device *dev,
 }
 static DEVICE_ATTR_RO(modalias);
 
+static ssize_t state_show(struct device *dev,
+                            struct device_attribute *attr, char *buf)
+{
+        return sprintf(buf, "%s\n",
+                        xenbus_strstate(to_xenbus_device(dev)->state));
+}
+static DEVICE_ATTR_RO(state);
+
 static struct attribute *xenbus_dev_attrs[] = {
         &dev_attr_nodename.attr,
         &dev_attr_devtype.attr,
         &dev_attr_modalias.attr,
+        &dev_attr_state.attr,
         NULL,
 };
 
diff --git a/fs/buffer.c b/fs/buffer.c
index 4cc679d5bf58..6f1ae3ac9789 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -39,7 +39,6 @@
 #include <linux/buffer_head.h>
 #include <linux/task_io_accounting_ops.h>
 #include <linux/bio.h>
-#include <linux/notifier.h>
 #include <linux/cpu.h>
 #include <linux/bitops.h>
 #include <linux/mpage.h>
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index ec3fba7d492f..488a9e7f8f66 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -24,6 +24,7 @@
 #include <linux/mpage.h>
 #include <linux/user_namespace.h>
 #include <linux/seq_file.h>
+#include <linux/blkdev.h>
 
 #include "isofs.h"
 #include "zisofs.h"
@@ -653,6 +654,12 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)
         /*
          * What if bugger tells us to go beyond page size?
          */
+        if (bdev_logical_block_size(s->s_bdev) > 2048) {
+                printk(KERN_WARNING
+                       "ISOFS: unsupported/invalid hardware sector size %d\n",
+                        bdev_logical_block_size(s->s_bdev));
+                goto out_freesbi;
+        }
         opt.blocksize = sb_min_blocksize(s, opt.blocksize);
 
         sbi->s_high_sierra = 0; /* default is iso9660 */
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index 05506d60131c..59cdb27826de 100644
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
@@ -132,13 +132,13 @@ static void __fsnotify_recalc_mask(struct fsnotify_mark_connector *conn)
         struct fsnotify_mark *mark;
 
         assert_spin_locked(&conn->lock);
+        /* We can get detached connector here when inode is getting unlinked. */
+        if (!fsnotify_valid_obj_type(conn->type))
+                return;
         hlist_for_each_entry(mark, &conn->list, obj_list) {
                 if (mark->flags & FSNOTIFY_MARK_FLAG_ATTACHED)
                         new_mask |= mark->mask;
         }
-        if (WARN_ON(!fsnotify_valid_obj_type(conn->type)))
-                return;
-
         *fsnotify_conn_mask_p(conn) = new_mask;
 }
 
diff --git a/fs/quota/quota.c b/fs/quota/quota.c
index 860bfbe7a07a..f0cbf58ad4da 100644
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
@@ -18,6 +18,7 @@
 #include <linux/quotaops.h>
 #include <linux/types.h>
 #include <linux/writeback.h>
+#include <linux/nospec.h>
 
 static int check_quotactl_permission(struct super_block *sb, int type, int cmd,
                                      qid_t id)
@@ -120,8 +121,6 @@ static int quota_getinfo(struct super_block *sb, int type, void __user *addr)
         struct if_dqinfo uinfo;
         int ret;
 
-        /* This checks whether qc_state has enough entries... */
-        BUILD_BUG_ON(MAXQUOTAS > XQM_MAXQUOTAS);
         if (!sb->s_qcop->get_state)
                 return -ENOSYS;
         ret = sb->s_qcop->get_state(sb, &state);
@@ -354,10 +353,10 @@ static int quota_getstate(struct super_block *sb, struct fs_quota_stat *fqs)
          * GETXSTATE quotactl has space for just one set of time limits so
          * report them for the first enabled quota type
          */
-        for (type = 0; type < XQM_MAXQUOTAS; type++)
+        for (type = 0; type < MAXQUOTAS; type++)
                 if (state.s_state[type].flags & QCI_ACCT_ENABLED)
                         break;
-        BUG_ON(type == XQM_MAXQUOTAS);
+        BUG_ON(type == MAXQUOTAS);
         fqs->qs_btimelimit = state.s_state[type].spc_timelimit;
         fqs->qs_itimelimit = state.s_state[type].ino_timelimit;
         fqs->qs_rtbtimelimit = state.s_state[type].rt_spc_timelimit;
@@ -427,10 +426,10 @@ static int quota_getstatev(struct super_block *sb, struct fs_quota_statv *fqs)
          * GETXSTATV quotactl has space for just one set of time limits so
          * report them for the first enabled quota type
          */
-        for (type = 0; type < XQM_MAXQUOTAS; type++)
+        for (type = 0; type < MAXQUOTAS; type++)
                 if (state.s_state[type].flags & QCI_ACCT_ENABLED)
                         break;
-        BUG_ON(type == XQM_MAXQUOTAS);
+        BUG_ON(type == MAXQUOTAS);
         fqs->qs_btimelimit = state.s_state[type].spc_timelimit;
         fqs->qs_itimelimit = state.s_state[type].ino_timelimit;
         fqs->qs_rtbtimelimit = state.s_state[type].rt_spc_timelimit;
@@ -701,8 +700,9 @@ static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id,
 {
         int ret;
 
-        if (type >= (XQM_COMMAND(cmd) ? XQM_MAXQUOTAS : MAXQUOTAS))
+        if (type >= MAXQUOTAS)
                 return -EINVAL;
+        type = array_index_nospec(type, MAXQUOTAS);
         /*
          * Quota not supported on this fs? Check this before s_quota_types
          * since they needn't be set if quota is not supported at all.
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 3040dc2a32f6..6f515651a2c2 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -764,9 +764,7 @@ static int udf_find_fileset(struct super_block *sb,
                             struct kernel_lb_addr *root)
 {
         struct buffer_head *bh = NULL;
-        long lastblock;
         uint16_t ident;
-        struct udf_sb_info *sbi;
 
         if (fileset->logicalBlockNum != 0xFFFFFFFF ||
             fileset->partitionReferenceNum != 0xFFFF) {
@@ -779,69 +777,11 @@ static int udf_find_fileset(struct super_block *sb,
                         return 1;
                 }
 
-        }
-
-        sbi = UDF_SB(sb);
-        if (!bh) {
-                /* Search backwards through the partitions */
-                struct kernel_lb_addr newfileset;
-
-/* --> cvg: FIXME - is it reasonable? */
-                return 1;
-
-                for (newfileset.partitionReferenceNum = sbi->s_partitions - 1;
-                     (newfileset.partitionReferenceNum != 0xFFFF &&
-                      fileset->logicalBlockNum == 0xFFFFFFFF &&
-                      fileset->partitionReferenceNum == 0xFFFF);
-                     newfileset.partitionReferenceNum--) {
-                        lastblock = sbi->s_partmaps
-                                        [newfileset.partitionReferenceNum]
-                                                .s_partition_len;
-                        newfileset.logicalBlockNum = 0;
-
-                        do {
-                                bh = udf_read_ptagged(sb, &newfileset, 0,
-                                                      &ident);
-                                if (!bh) {
-                                        newfileset.logicalBlockNum++;
-                                        continue;
-                                }
-
-                                switch (ident) {
-                                case TAG_IDENT_SBD:
-                                {
-                                        struct spaceBitmapDesc *sp;
-                                        sp = (struct spaceBitmapDesc *)
-                                                                bh->b_data;
-                                        newfileset.logicalBlockNum += 1 +
-                                                ((le32_to_cpu(sp->numOfBytes) +
-                                                  sizeof(struct spaceBitmapDesc)
-                                                  - 1) >> sb->s_blocksize_bits);
-                                        brelse(bh);
-                                        break;
-                                }
-                                case TAG_IDENT_FSD:
-                                        *fileset = newfileset;
-                                        break;
-                                default:
-                                        newfileset.logicalBlockNum++;
-                                        brelse(bh);
-                                        bh = NULL;
-                                        break;
-                                }
-                        } while (newfileset.logicalBlockNum < lastblock &&
-                                 fileset->logicalBlockNum == 0xFFFFFFFF &&
-                                 fileset->partitionReferenceNum == 0xFFFF);
-                }
-        }
-
-        if ((fileset->logicalBlockNum != 0xFFFFFFFF ||
-             fileset->partitionReferenceNum != 0xFFFF) && bh) {
                 udf_debug("Fileset at block=%u, partition=%u\n",
                           fileset->logicalBlockNum,
                           fileset->partitionReferenceNum);
 
-                sbi->s_partition = fileset->partitionReferenceNum;
+                UDF_SB(sb)->s_partition = fileset->partitionReferenceNum;
                 udf_load_fileset(sb, bh, root);
                 brelse(bh);
                 return 0;
@@ -1570,10 +1510,16 @@ static void udf_load_logicalvolint(struct super_block *sb, struct kernel_extent_
  */
 #define PART_DESC_ALLOC_STEP 32
 
+struct part_desc_seq_scan_data {
+        struct udf_vds_record rec;
+        u32 partnum;
+};
+
 struct desc_seq_scan_data {
         struct udf_vds_record vds[VDS_POS_LENGTH];
         unsigned int size_part_descs;
-        struct udf_vds_record *part_descs_loc;
+        unsigned int num_part_descs;
+        struct part_desc_seq_scan_data *part_descs_loc;
 };
 
 static struct udf_vds_record *handle_partition_descriptor(
@@ -1582,10 +1528,14 @@ static struct udf_vds_record *handle_partition_descriptor(
 {
         struct partitionDesc *desc = (struct partitionDesc *)bh->b_data;
         int partnum;
+        int i;
 
         partnum = le16_to_cpu(desc->partitionNumber);
-        if (partnum >= data->size_part_descs) {
-                struct udf_vds_record *new_loc;
+        for (i = 0; i < data->num_part_descs; i++)
+                if (partnum == data->part_descs_loc[i].partnum)
+                        return &(data->part_descs_loc[i].rec);
+        if (data->num_part_descs >= data->size_part_descs) {
+                struct part_desc_seq_scan_data *new_loc;
                 unsigned int new_size = ALIGN(partnum, PART_DESC_ALLOC_STEP);
 
                 new_loc = kcalloc(new_size, sizeof(*new_loc), GFP_KERNEL);
@@ -1597,7 +1547,7 @@ static struct udf_vds_record *handle_partition_descriptor(
                 data->part_descs_loc = new_loc;
                 data->size_part_descs = new_size;
         }
-        return &(data->part_descs_loc[partnum]);
+        return &(data->part_descs_loc[data->num_part_descs++].rec);
 }
 
 
@@ -1647,6 +1597,7 @@ static noinline int udf_process_sequence(
 
         memset(data.vds, 0, sizeof(struct udf_vds_record) * VDS_POS_LENGTH);
         data.size_part_descs = PART_DESC_ALLOC_STEP;
+        data.num_part_descs = 0;
         data.part_descs_loc = kcalloc(data.size_part_descs,
                                       sizeof(*data.part_descs_loc),
                                       GFP_KERNEL);
@@ -1658,7 +1609,6 @@ static noinline int udf_process_sequence(
          * are in it.
          */
         for (; (!done && block <= lastblock); block++) {
-
                 bh = udf_read_tagged(sb, block, block, &ident);
                 if (!bh)
                         break;
@@ -1730,13 +1680,10 @@ static noinline int udf_process_sequence(
         }
 
         /* Now handle prevailing Partition Descriptors */
-        for (i = 0; i < data.size_part_descs; i++) {
-                if (data.part_descs_loc[i].block) {
-                        ret = udf_load_partdesc(sb,
-                                                data.part_descs_loc[i].block);
-                        if (ret < 0)
-                                return ret;
-                }
+        for (i = 0; i < data.num_part_descs; i++) {
+                ret = udf_load_partdesc(sb, data.part_descs_loc[i].rec.block);
+                if (ret < 0)
+                        return ret;
         }
 
         return 0;
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index ca1d2cc2cdfa..18863d56273c 100644
--- a/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@ -199,47 +199,57 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,
 
 #define __declare_arg_0(a0, res)                                        \
         struct arm_smccc_res   *___res = res;                           \
-        register u32           r0 asm("r0") = a0;                       \
+        register unsigned long r0 asm("r0") = (u32)a0;                  \
         register unsigned long r1 asm("r1");                            \
         register unsigned long r2 asm("r2");                            \
         register unsigned long r3 asm("r3")
 
 #define __declare_arg_1(a0, a1, res)                                    \
+        typeof(a1) __a1 = a1;                                           \
         struct arm_smccc_res   *___res = res;                           \
-        register u32           r0 asm("r0") = a0;                       \
-        register typeof(a1)    r1 asm("r1") = a1;                       \
+        register unsigned long r0 asm("r0") = (u32)a0;                  \
+        register unsigned long r1 asm("r1") = __a1;                     \
         register unsigned long r2 asm("r2");                            \
         register unsigned long r3 asm("r3")
 
 #define __declare_arg_2(a0, a1, a2, res)                                \
+        typeof(a1) __a1 = a1;                                           \
+        typeof(a2) __a2 = a2;                                           \
         struct arm_smccc_res   *___res = res;                           \
-        register u32           r0 asm("r0") = a0;                       \
-        register typeof(a1)    r1 asm("r1") = a1;                       \
-        register typeof(a2)    r2 asm("r2") = a2;                       \
+        register unsigned long r0 asm("r0") = (u32)a0;                  \
+        register unsigned long r1 asm("r1") = __a1;                     \
+        register unsigned long r2 asm("r2") = __a2;                     \
         register unsigned long r3 asm("r3")
 
 #define __declare_arg_3(a0, a1, a2, a3, res)                            \
+        typeof(a1) __a1 = a1;                                           \
+        typeof(a2) __a2 = a2;                                           \
+        typeof(a3) __a3 = a3;                                           \
         struct arm_smccc_res   *___res = res;                           \
-        register u32           r0 asm("r0") = a0;                       \
-        register typeof(a1)    r1 asm("r1") = a1;                       \
-        register typeof(a2)    r2 asm("r2") = a2;                       \
-        register typeof(a3)    r3 asm("r3") = a3
+        register unsigned long r0 asm("r0") = (u32)a0;                  \
+        register unsigned long r1 asm("r1") = __a1;                     \
+        register unsigned long r2 asm("r2") = __a2;                     \
+        register unsigned long r3 asm("r3") = __a3
 
 #define __declare_arg_4(a0, a1, a2, a3, a4, res)                        \
+        typeof(a4) __a4 = a4;                                           \
         __declare_arg_3(a0, a1, a2, a3, res);                           \
-        register typeof(a4) r4 asm("r4") = a4
+        register unsigned long r4 asm("r4") = __a4
 
 #define __declare_arg_5(a0, a1, a2, a3, a4, a5, res)                    \
+        typeof(a5) __a5 = a5;                                           \
         __declare_arg_4(a0, a1, a2, a3, a4, res);                       \
-        register typeof(a5) r5 asm("r5") = a5
+        register unsigned long r5 asm("r5") = __a5
 
 #define __declare_arg_6(a0, a1, a2, a3, a4, a5, a6, res)                \
+        typeof(a6) __a6 = a6;                                           \
         __declare_arg_5(a0, a1, a2, a3, a4, a5, res);                   \
-        register typeof(a6) r6 asm("r6") = a6
+        register unsigned long r6 asm("r6") = __a6
 
 #define __declare_arg_7(a0, a1, a2, a3, a4, a5, a6, a7, res)            \
+        typeof(a7) __a7 = a7;                                           \
         __declare_arg_6(a0, a1, a2, a3, a4, a5, a6, res);               \
-        register typeof(a7) r7 asm("r7") = a7
+        register unsigned long r7 asm("r7") = __a7
 
 #define ___declare_args(count, ...) __declare_arg_ ## count(__VA_ARGS__)
 #define __declare_args(count, ...)  ___declare_args(count, __VA_ARGS__)
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index b79387fd57da..65b4eaed1d96 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -855,7 +855,7 @@ static inline u8 i2c_8bit_addr_from_msg(const struct i2c_msg *msg)
 }
 
 u8 *i2c_get_dma_safe_msg_buf(struct i2c_msg *msg, unsigned int threshold);
-void i2c_release_dma_safe_msg_buf(struct i2c_msg *msg, u8 *buf);
+void i2c_put_dma_safe_msg_buf(u8 *buf, struct i2c_msg *msg, bool xferred);
 
 int i2c_handle_smbus_host_notify(struct i2c_adapter *adap, unsigned short addr);
 /**
diff --git a/include/linux/of.h b/include/linux/of.h
index 4d25e4f952d9..99b0ebf49632 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -256,6 +256,9 @@ static inline unsigned long of_read_ulong(const __be32 *cell, int size)
 #define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags)
 #define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags)
 
+extern bool of_node_name_eq(const struct device_node *np, const char *name);
+extern bool of_node_name_prefix(const struct device_node *np, const char *prefix);
+
 static inline const char *of_node_full_name(const struct device_node *np)
 {
         return np ? np->full_name : "<no-node>";
@@ -290,6 +293,8 @@ extern struct device_node *of_get_next_child(const struct device_node *node,
 extern struct device_node *of_get_next_available_child(
         const struct device_node *node, struct device_node *prev);
 
+extern struct device_node *of_get_compatible_child(const struct device_node *parent,
+                                        const char *compatible);
 extern struct device_node *of_get_child_by_name(const struct device_node *node,
                                         const char *name);
 
@@ -561,6 +566,16 @@ static inline struct device_node *to_of_node(const struct fwnode_handle *fwnode)
         return NULL;
 }
 
+static inline bool of_node_name_eq(const struct device_node *np, const char *name)
+{
+        return false;
+}
+
+static inline bool of_node_name_prefix(const struct device_node *np, const char *prefix)
+{
+        return false;
+}
+
 static inline const char* of_node_full_name(const struct device_node *np)
 {
         return "<no-node>";
@@ -632,6 +647,12 @@ static inline bool of_have_populated_dt(void)
         return false;
 }
 
+static inline struct device_node *of_get_compatible_child(const struct device_node *parent,
+                                        const char *compatible)
+{
+        return NULL;
+}
+
 static inline struct device_node *of_get_child_by_name(
                                         const struct device_node *node,
                                         const char *name)
@@ -967,6 +988,18 @@ static inline struct device_node *of_find_matching_node(
         return of_find_matching_node_and_match(from, matches, NULL);
 }
 
+static inline const char *of_node_get_device_type(const struct device_node *np)
+{
+        return of_get_property(np, "type", NULL);
+}
+
+static inline bool of_node_is_type(const struct device_node *np, const char *type)
+{
+        const char *match = of_node_get_device_type(np);
+
+        return np && match && type && !strcmp(match, type);
+}
+
 /**
  * of_property_count_u8_elems - Count the number of u8 elements in a property
  *
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 99d366cb0e9f..d157983b84cf 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -3084,4 +3084,6 @@
 
 #define PCI_VENDOR_ID_OCZ               0x1b85
 
+#define PCI_VENDOR_ID_NCUBE             0x10ff
+
 #endif /* _LINUX_PCI_IDS_H */
diff --git a/include/linux/platform_data/ina2xx.h b/include/linux/platform_data/ina2xx.h
index 9abc0ca7259b..9f0aa1b48c78 100644
--- a/include/linux/platform_data/ina2xx.h
+++ b/include/linux/platform_data/ina2xx.h
@@ -1,7 +1,7 @@
 /*
  * Driver for Texas Instruments INA219, INA226 power monitor chips
  *
- * Copyright (C) 2012 Lothar Felten <l-felten@ti.com>
+ * Copyright (C) 2012 Lothar Felten <lothar.felten@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/include/linux/quota.h b/include/linux/quota.h
index ca9772c8e48b..f32dd270b8e3 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -408,13 +408,7 @@ struct qc_type_state {
 
 struct qc_state {
         unsigned int s_incoredqs;       /* Number of dquots in core */
-        /*
-         * Per quota type information. The array should really have
-         * max(MAXQUOTAS, XQM_MAXQUOTAS) entries. BUILD_BUG_ON in
-         * quota_getinfo() makes sure XQM_MAXQUOTAS is large enough.  Once VFS
-         * supports project quotas, this can be changed to MAXQUOTAS
-         */
-        struct qc_type_state s_state[XQM_MAXQUOTAS];
+        struct qc_type_state s_state[MAXQUOTAS];  /* Per quota type information */
 };
 
 /* Structure for communicating via ->set_info */
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 46c4cbf54903..33c2a1d2a8d2 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -4876,8 +4876,8 @@ const char *reg_initiator_name(enum nl80211_reg_initiator initiator);
  *
  * Return: 0 on success. -ENODATA.
  */
-int reg_query_regdb_wmm(char *alpha2, int freq, u32 *ptr,
-                        struct ieee80211_wmm_rule *rule);
+int reg_query_regdb_wmm(char *alpha2, int freq,
+                        struct ieee80211_reg_rule *rule);
 
 /*
  * callbacks for asynchronous cfg80211 methods, notification
diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 60f8cc86a447..3469750df0f4 100644
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -217,15 +217,15 @@ struct ieee80211_wmm_rule {
 struct ieee80211_reg_rule {
         struct ieee80211_freq_range freq_range;
         struct ieee80211_power_rule power_rule;
-        struct ieee80211_wmm_rule *wmm_rule;
+        struct ieee80211_wmm_rule wmm_rule;
         u32 flags;
         u32 dfs_cac_ms;
+        bool has_wmm;
 };
 
 struct ieee80211_regdomain {
         struct rcu_head rcu_head;
         u32 n_reg_rules;
-        u32 n_wmm_rules;
         char alpha2[3];
         enum nl80211_dfs_regions dfs_region;
         struct ieee80211_reg_rule reg_rules[];
diff --git a/include/uapi/linux/rds.h b/include/uapi/linux/rds.h
index dc520e1a4123..8b73cb603c5f 100644
--- a/include/uapi/linux/rds.h
+++ b/include/uapi/linux/rds.h
@@ -37,6 +37,7 @@
 
 #include <linux/types.h>
 #include <linux/socket.h>               /* For __kernel_sockaddr_storage. */
+#include <linux/in6.h>                  /* For struct in6_addr. */
 
 #define RDS_IB_ABI_VERSION              0x301
 
diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h
index b1e22c40c4b6..84c3de89696a 100644
--- a/include/uapi/linux/vhost.h
+++ b/include/uapi/linux/vhost.h
@@ -176,7 +176,7 @@ struct vhost_memory {
 #define VHOST_BACKEND_F_IOTLB_MSG_V2 0x1
 
 #define VHOST_SET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x25, __u64)
-#define VHOST_GET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x26, __u64)
+#define VHOST_GET_BACKEND_FEATURES _IOR(VHOST_VIRTIO, 0x26, __u64)
 
 /* VHOST_NET specific defines */
 
diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c
index cf5195c7c331..488ef9663c01 100644
--- a/kernel/bpf/sockmap.c
+++ b/kernel/bpf/sockmap.c
@@ -236,7 +236,7 @@ static int bpf_tcp_init(struct sock *sk)
 }
 
 static void smap_release_sock(struct smap_psock *psock, struct sock *sock);
-static int free_start_sg(struct sock *sk, struct sk_msg_buff *md);
+static int free_start_sg(struct sock *sk, struct sk_msg_buff *md, bool charge);
 
 static void bpf_tcp_release(struct sock *sk)
 {
@@ -248,7 +248,7 @@ static void bpf_tcp_release(struct sock *sk)
                 goto out;
 
         if (psock->cork) {
-                free_start_sg(psock->sock, psock->cork);
+                free_start_sg(psock->sock, psock->cork, true);
                 kfree(psock->cork);
                 psock->cork = NULL;
         }
@@ -330,14 +330,14 @@ static void bpf_tcp_close(struct sock *sk, long timeout)
         close_fun = psock->save_close;
 
         if (psock->cork) {
-                free_start_sg(psock->sock, psock->cork);
+                free_start_sg(psock->sock, psock->cork, true);
                 kfree(psock->cork);
                 psock->cork = NULL;
         }
 
         list_for_each_entry_safe(md, mtmp, &psock->ingress, list) {
                 list_del(&md->list);
-                free_start_sg(psock->sock, md);
+                free_start_sg(psock->sock, md, true);
                 kfree(md);
         }
 
@@ -369,7 +369,7 @@ static void bpf_tcp_close(struct sock *sk, long timeout)
                         /* If another thread deleted this object skip deletion.
                          * The refcnt on psock may or may not be zero.
                          */
-                        if (l) {
+                        if (l && l == link) {
                                 hlist_del_rcu(&link->hash_node);
                                 smap_release_sock(psock, link->sk);
                                 free_htab_elem(htab, link);
@@ -570,14 +570,16 @@ static void free_bytes_sg(struct sock *sk, int bytes,
         md->sg_start = i;
 }
 
-static int free_sg(struct sock *sk, int start, struct sk_msg_buff *md)
+static int free_sg(struct sock *sk, int start,
+                   struct sk_msg_buff *md, bool charge)
 {
         struct scatterlist *sg = md->sg_data;
         int i = start, free = 0;
 
         while (sg[i].length) {
                 free += sg[i].length;
-                sk_mem_uncharge(sk, sg[i].length);
+                if (charge)
+                        sk_mem_uncharge(sk, sg[i].length);
                 if (!md->skb)
                         put_page(sg_page(&sg[i]));
                 sg[i].length = 0;
@@ -594,9 +596,9 @@ static int free_sg(struct sock *sk, int start, struct sk_msg_buff *md)
         return free;
 }
 
-static int free_start_sg(struct sock *sk, struct sk_msg_buff *md)
+static int free_start_sg(struct sock *sk, struct sk_msg_buff *md, bool charge)
 {
-        int free = free_sg(sk, md->sg_start, md);
+        int free = free_sg(sk, md->sg_start, md, charge);
 
         md->sg_start = md->sg_end;
         return free;
@@ -604,7 +606,7 @@ static int free_start_sg(struct sock *sk, struct sk_msg_buff *md)
 
 static int free_curr_sg(struct sock *sk, struct sk_msg_buff *md)
 {
-        return free_sg(sk, md->sg_curr, md);
+        return free_sg(sk, md->sg_curr, md, true);
 }
 
 static int bpf_map_msg_verdict(int _rc, struct sk_msg_buff *md)
@@ -718,7 +720,7 @@ static int bpf_tcp_ingress(struct sock *sk, int apply_bytes,
                 list_add_tail(&r->list, &psock->ingress);
                 sk->sk_data_ready(sk);
         } else {
-                free_start_sg(sk, r);
+                free_start_sg(sk, r, true);
                 kfree(r);
         }
 
@@ -752,14 +754,10 @@ static int bpf_tcp_sendmsg_do_redirect(struct sock *sk, int send,
                 release_sock(sk);
         }
         smap_release_sock(psock, sk);
-        if (unlikely(err))
-                goto out;
-        return 0;
+        return err;
 out_rcu:
         rcu_read_unlock();
-out:
-        free_bytes_sg(NULL, send, md, false);
-        return err;
+        return 0;
 }
 
 static inline void bpf_md_init(struct smap_psock *psock)
@@ -822,7 +820,7 @@ more_data:
         case __SK_PASS:
                 err = bpf_tcp_push(sk, send, m, flags, true);
                 if (unlikely(err)) {
-                        *copied -= free_start_sg(sk, m);
+                        *copied -= free_start_sg(sk, m, true);
                         break;
                 }
 
@@ -845,16 +843,17 @@ more_data:
                 lock_sock(sk);
 
                 if (unlikely(err < 0)) {
-                        free_start_sg(sk, m);
+                        int free = free_start_sg(sk, m, false);
+
                         psock->sg_size = 0;
                         if (!cork)
-                                *copied -= send;
+                                *copied -= free;
                 } else {
                         psock->sg_size -= send;
                 }
 
                 if (cork) {
-                        free_start_sg(sk, m);
+                        free_start_sg(sk, m, true);
                         psock->sg_size = 0;
                         kfree(m);
                         m = NULL;
@@ -912,6 +911,8 @@ static int bpf_tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
 
         if (unlikely(flags & MSG_ERRQUEUE))
                 return inet_recv_error(sk, msg, len, addr_len);
+        if (!skb_queue_empty(&sk->sk_receive_queue))
+                return tcp_recvmsg(sk, msg, len, nonblock, flags, addr_len);
 
         rcu_read_lock();
         psock = smap_psock_sk(sk);
@@ -922,9 +923,6 @@ static int bpf_tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
                 goto out;
         rcu_read_unlock();
 
-        if (!skb_queue_empty(&sk->sk_receive_queue))
-                return tcp_recvmsg(sk, msg, len, nonblock, flags, addr_len);
-
         lock_sock(sk);
 bytes_ready:
         while (copied != len) {
@@ -1122,7 +1120,7 @@ wait_for_memory:
                 err = sk_stream_wait_memory(sk, &timeo);
                 if (err) {
                         if (m && m != psock->cork)
-                                free_start_sg(sk, m);
+                                free_start_sg(sk, m, true);
                         goto out_err;
                 }
         }
@@ -1464,10 +1462,16 @@ static void smap_destroy_psock(struct rcu_head *rcu)
         schedule_work(&psock->gc_work);
 }
 
+static bool psock_is_smap_sk(struct sock *sk)
+{
+        return inet_csk(sk)->icsk_ulp_ops == &bpf_tcp_ulp_ops;
+}
+
 static void smap_release_sock(struct smap_psock *psock, struct sock *sock)
 {
         if (refcount_dec_and_test(&psock->refcnt)) {
-                tcp_cleanup_ulp(sock);
+                if (psock_is_smap_sk(sock))
+                        tcp_cleanup_ulp(sock);
                 write_lock_bh(&sock->sk_callback_lock);
                 smap_stop_sock(psock, sock);
                 write_unlock_bh(&sock->sk_callback_lock);
@@ -1581,13 +1585,13 @@ static void smap_gc_work(struct work_struct *w)
                 bpf_prog_put(psock->bpf_tx_msg);
 
         if (psock->cork) {
-                free_start_sg(psock->sock, psock->cork);
+                free_start_sg(psock->sock, psock->cork, true);
                 kfree(psock->cork);
         }
 
         list_for_each_entry_safe(md, mtmp, &psock->ingress, list) {
                 list_del(&md->list);
-                free_start_sg(psock->sock, md);
+                free_start_sg(psock->sock, md, true);
                 kfree(md);
         }
 
@@ -1894,6 +1898,10 @@ static int __sock_map_ctx_update_elem(struct bpf_map *map,
          * doesn't update user data.
          */
         if (psock) {
+                if (!psock_is_smap_sk(sock)) {
+                        err = -EBUSY;
+                        goto out_progs;
+                }
                 if (READ_ONCE(psock->bpf_parse) && parse) {
                         err = -EBUSY;
                         goto out_progs;
diff --git a/kernel/cpu.c b/kernel/cpu.c
index ed44d7d34c2d..aa7fe85ad62e 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -102,8 +102,6 @@ static inline void cpuhp_lock_release(bool bringup) { }
  * @name:       Name of the step
  * @startup:    Startup function of the step
  * @teardown:   Teardown function of the step
- * @skip_onerr: Do not invoke the functions on error rollback
- *              Will go away once the notifiers are gone
  * @cant_stop:  Bringup/teardown can't be stopped at this step
  */
 struct cpuhp_step {
@@ -119,7 +117,6 @@ struct cpuhp_step {
                                          struct hlist_node *node);
         } teardown;
         struct hlist_head       list;
-        bool                    skip_onerr;
         bool                    cant_stop;
         bool                    multi_instance;
 };
@@ -550,12 +547,8 @@ static int bringup_cpu(unsigned int cpu)
 
 static void undo_cpu_up(unsigned int cpu, struct cpuhp_cpu_state *st)
 {
-        for (st->state--; st->state > st->target; st->state--) {
-                struct cpuhp_step *step = cpuhp_get_step(st->state);
-
-                if (!step->skip_onerr)
-                        cpuhp_invoke_callback(cpu, st->state, false, NULL, NULL);
-        }
+        for (st->state--; st->state > st->target; st->state--)
+                cpuhp_invoke_callback(cpu, st->state, false, NULL, NULL);
 }
 
 static int cpuhp_up_callbacks(unsigned int cpu, struct cpuhp_cpu_state *st,
@@ -644,12 +637,6 @@ static void cpuhp_thread_fun(unsigned int cpu)
 
         WARN_ON_ONCE(!cpuhp_is_ap_state(state));
 
-        if (st->rollback) {
-                struct cpuhp_step *step = cpuhp_get_step(state);
-                if (step->skip_onerr)
-                        goto next;
-        }
-
         if (cpuhp_is_atomic_state(state)) {
                 local_irq_disable();
                 st->result = cpuhp_invoke_callback(cpu, state, bringup, st->node, &st->last);
@@ -673,7 +660,6 @@ static void cpuhp_thread_fun(unsigned int cpu)
                 st->should_run = false;
         }
 
-next:
         cpuhp_lock_release(bringup);
 
         if (!st->should_run)
@@ -916,12 +902,8 @@ void cpuhp_report_idle_dead(void)
 
 static void undo_cpu_down(unsigned int cpu, struct cpuhp_cpu_state *st)
 {
-        for (st->state++; st->state < st->target; st->state++) {
-                struct cpuhp_step *step = cpuhp_get_step(st->state);
-
-                if (!step->skip_onerr)
-                        cpuhp_invoke_callback(cpu, st->state, true, NULL, NULL);
-        }
+        for (st->state++; st->state < st->target; st->state++)
+                cpuhp_invoke_callback(cpu, st->state, true, NULL, NULL);
 }
 
 static int cpuhp_down_callbacks(unsigned int cpu, struct cpuhp_cpu_state *st,
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 1c35b7b945d0..de87b0282e74 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -168,7 +168,7 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents,
 int dma_direct_supported(struct device *dev, u64 mask)
 {
 #ifdef CONFIG_ZONE_DMA
-        if (mask < DMA_BIT_MASK(ARCH_ZONE_DMA_BITS))
+        if (mask < phys_to_dma(dev, DMA_BIT_MASK(ARCH_ZONE_DMA_BITS)))
                 return 0;
 #else
         /*
@@ -177,7 +177,7 @@ int dma_direct_supported(struct device *dev, u64 mask)
          * memory, or by providing a ZONE_DMA32.  If neither is the case, the
          * architecture needs to use an IOMMU instead of the direct mapping.
          */
-        if (mask < DMA_BIT_MASK(32))
+        if (mask < phys_to_dma(dev, DMA_BIT_MASK(32)))
                 return 0;
 #endif
         /*
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 924e37fb1620..fd6f8ed28e01 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -38,7 +38,6 @@
 #include <linux/kmsg_dump.h>
 #include <linux/syslog.h>
 #include <linux/cpu.h>
-#include <linux/notifier.h>
 #include <linux/rculist.h>
 #include <linux/poll.h>
 #include <linux/irq_work.h>
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 5470dce212c0..977918d5d350 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -261,7 +261,7 @@ static void __touch_watchdog(void)
  * entering idle state.  This should only be used for scheduler events.
  * Use touch_softlockup_watchdog() for everything else.
  */
-void touch_softlockup_watchdog_sched(void)
+notrace void touch_softlockup_watchdog_sched(void)
 {
         /*
          * Preemption can be enabled.  It doesn't matter which CPU's timestamp
@@ -270,7 +270,7 @@ void touch_softlockup_watchdog_sched(void)
         raw_cpu_write(watchdog_touch_ts, 0);
 }
 
-void touch_softlockup_watchdog(void)
+notrace void touch_softlockup_watchdog(void)
 {
         touch_softlockup_watchdog_sched();
         wq_watchdog_touch(raw_smp_processor_id());
diff --git a/kernel/watchdog_hld.c b/kernel/watchdog_hld.c
index 1f7020d65d0a..71381168dede 100644
--- a/kernel/watchdog_hld.c
+++ b/kernel/watchdog_hld.c
@@ -29,7 +29,7 @@ static struct cpumask dead_events_mask;
 static unsigned long hardlockup_allcpu_dumped;
 static atomic_t watchdog_cpus = ATOMIC_INIT(0);
 
-void arch_touch_nmi_watchdog(void)
+notrace void arch_touch_nmi_watchdog(void)
 {
         /*
          * Using __raw here because some code paths have
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 60e80198c3df..0280deac392e 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -5574,7 +5574,7 @@ static void wq_watchdog_timer_fn(struct timer_list *unused)
         mod_timer(&wq_watchdog_timer, jiffies + thresh);
 }
 
-void wq_watchdog_touch(int cpu)
+notrace void wq_watchdog_touch(int cpu)
 {
         if (cpu >= 0)
                 per_cpu(wq_watchdog_touched_cpu, cpu) = jiffies;
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index c72577e472f2..a66595ba5543 100644
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/percpu_counter.h>
-#include <linux/notifier.h>
 #include <linux/mutex.h>
 #include <linux/init.h>
 #include <linux/cpu.h>
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 6551d3b0dc30..84ae9bf5858a 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -27,7 +27,6 @@
 #include <linux/mpage.h>
 #include <linux/rmap.h>
 #include <linux/percpu.h>
-#include <linux/notifier.h>
 #include <linux/smp.h>
 #include <linux/sysctl.h>
 #include <linux/cpu.h>
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index e75865d58ba7..05e983f42316 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -32,7 +32,6 @@
 #include <linux/slab.h>
 #include <linux/ratelimit.h>
 #include <linux/oom.h>
-#include <linux/notifier.h>
 #include <linux/topology.h>
 #include <linux/sysctl.h>
 #include <linux/cpu.h>
diff --git a/mm/slub.c b/mm/slub.c
index ce2b9e5cea77..8da34a8af53d 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -19,7 +19,6 @@
 #include <linux/slab.h>
 #include "slab.h"
 #include <linux/proc_fs.h>
-#include <linux/notifier.h>
 #include <linux/seq_file.h>
 #include <linux/kasan.h>
 #include <linux/cpu.h>
diff --git a/net/core/dev.c b/net/core/dev.c
index 325fc5088370..82114e1111e6 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -93,7 +93,6 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
-#include <linux/notifier.h>
 #include <linux/skbuff.h>
 #include <linux/bpf.h>
 #include <linux/bpf_trace.h>
diff --git a/net/core/filter.c b/net/core/filter.c
index feb578506009..d301134bca3a 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -2282,14 +2282,21 @@ static const struct bpf_func_proto bpf_msg_cork_bytes_proto = {
         .arg2_type      = ARG_ANYTHING,
 };
 
+#define sk_msg_iter_var(var)                    \
+        do {                                    \
+                var++;                          \
+                if (var == MAX_SKB_FRAGS)       \
+                        var = 0;                \
+        } while (0)
+
 BPF_CALL_4(bpf_msg_pull_data,
            struct sk_msg_buff *, msg, u32, start, u32, end, u64, flags)
 {
-        unsigned int len = 0, offset = 0, copy = 0;
+        unsigned int len = 0, offset = 0, copy = 0, poffset = 0;
+        int bytes = end - start, bytes_sg_total;
         struct scatterlist *sg = msg->sg_data;
         int first_sg, last_sg, i, shift;
         unsigned char *p, *to, *from;
-        int bytes = end - start;
         struct page *page;
 
         if (unlikely(flags || end <= start))
@@ -2299,21 +2306,22 @@ BPF_CALL_4(bpf_msg_pull_data,
         i = msg->sg_start;
         do {
                 len = sg[i].length;
-                offset += len;
                 if (start < offset + len)
                         break;
-                i++;
-                if (i == MAX_SKB_FRAGS)
-                        i = 0;
+                offset += len;
+                sk_msg_iter_var(i);
         } while (i != msg->sg_end);
 
         if (unlikely(start >= offset + len))
                 return -EINVAL;
 
-        if (!msg->sg_copy[i] && bytes <= len)
-                goto out;
-
         first_sg = i;
+        /* The start may point into the sg element so we need to also
+         * account for the headroom.
+         */
+        bytes_sg_total = start - offset + bytes;
+        if (!msg->sg_copy[i] && bytes_sg_total <= len)
+                goto out;
 
         /* At this point we need to linearize multiple scatterlist
          * elements or a single shared page. Either way we need to
@@ -2327,37 +2335,32 @@ BPF_CALL_4(bpf_msg_pull_data,
          */
         do {
                 copy += sg[i].length;
-                i++;
-                if (i == MAX_SKB_FRAGS)
-                        i = 0;
-                if (bytes < copy)
+                sk_msg_iter_var(i);
+                if (bytes_sg_total <= copy)
                         break;
         } while (i != msg->sg_end);
         last_sg = i;
 
-        if (unlikely(copy < end - start))
+        if (unlikely(bytes_sg_total > copy))
                 return -EINVAL;
 
         page = alloc_pages(__GFP_NOWARN | GFP_ATOMIC, get_order(copy));
         if (unlikely(!page))
                 return -ENOMEM;
         p = page_address(page);
-        offset = 0;
 
         i = first_sg;
         do {
                 from = sg_virt(&sg[i]);
                 len = sg[i].length;
-                to = p + offset;
+                to = p + poffset;
 
                 memcpy(to, from, len);
-                offset += len;
+                poffset += len;
                 sg[i].length = 0;
                 put_page(sg_page(&sg[i]));
 
-                i++;
-                if (i == MAX_SKB_FRAGS)
-                        i = 0;
+                sk_msg_iter_var(i);
         } while (i != last_sg);
 
         sg[first_sg].length = copy;
@@ -2367,11 +2370,15 @@ BPF_CALL_4(bpf_msg_pull_data,
          * had a single entry though we can just replace it and
          * be done. Otherwise walk the ring and shift the entries.
          */
-        shift = last_sg - first_sg - 1;
+        WARN_ON_ONCE(last_sg == first_sg);
+        shift = last_sg > first_sg ?
+                last_sg - first_sg - 1 :
+                MAX_SKB_FRAGS - first_sg + last_sg - 1;
         if (!shift)
                 goto out;
 
-        i = first_sg + 1;
+        i = first_sg;
+        sk_msg_iter_var(i);
         do {
                 int move_from;
 
@@ -2388,15 +2395,13 @@ BPF_CALL_4(bpf_msg_pull_data,
                 sg[move_from].page_link = 0;
                 sg[move_from].offset = 0;
 
-                i++;
-                if (i == MAX_SKB_FRAGS)
-                        i = 0;
+                sk_msg_iter_var(i);
         } while (1);
         msg->sg_end -= shift;
         if (msg->sg_end < 0)
                 msg->sg_end += MAX_SKB_FRAGS;
 out:
-        msg->data = sg_virt(&sg[i]) + start - offset;
+        msg->data = sg_virt(&sg[first_sg]) + start - offset;
         msg->data_end = msg->data + bytes;
 
         return 0;
@@ -7298,7 +7303,7 @@ static u32 sk_reuseport_convert_ctx_access(enum bpf_access_type type,
                 break;
 
         case offsetof(struct sk_reuseport_md, ip_protocol):
-                BUILD_BUG_ON(hweight_long(SK_FL_PROTO_MASK) != BITS_PER_BYTE);
+                BUILD_BUG_ON(HWEIGHT32(SK_FL_PROTO_MASK) != BITS_PER_BYTE);
                 SK_REUSEPORT_LOAD_SK_FIELD_SIZE_OFF(__sk_flags_offset,
                                                     BPF_W, 0);
                 *insn++ = BPF_ALU32_IMM(BPF_AND, si->dst_reg, SK_FL_PROTO_MASK);
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 24431e578310..60c928894a78 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -324,6 +324,10 @@ void rtnl_unregister_all(int protocol)
 
         rtnl_lock();
         tab = rtnl_msg_handlers[protocol];
+        if (!tab) {
+                rtnl_unlock();
+                return;
+        }
         RCU_INIT_POINTER(rtnl_msg_handlers[protocol], NULL);
         for (msgindex = 0; msgindex < RTM_NR_MSGTYPES; msgindex++) {
                 link = tab[msgindex];
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index e63c554e0623..9f3209ff7ffd 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -19,12 +19,10 @@
 #include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 #include <linux/of_net.h>
-#include <linux/of_gpio.h>
 #include <linux/netdevice.h>
 #include <linux/sysfs.h>
 #include <linux/phy_fixed.h>
 #include <linux/ptp_classify.h>
-#include <linux/gpio/consumer.h>
 #include <linux/etherdevice.h>
 
 #include "dsa_priv.h"
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index cf75f8944b05..4da39446da2d 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -820,10 +820,9 @@ static void igmp_timer_expire(struct timer_list *t)
         spin_lock(&im->lock);
         im->tm_running = 0;
 
-        if (im->unsolicit_count) {
-                im->unsolicit_count--;
+        if (im->unsolicit_count && --im->unsolicit_count)
                 igmp_start_timer(im, unsolicited_report_interval(in_dev));
-        }
+
         im->reporter = 1;
         spin_unlock(&im->lock);
 
@@ -1308,6 +1307,8 @@ static void igmp_group_added(struct ip_mc_list *im)
 
         if (in_dev->dead)
                 return;
+
+        im->unsolicit_count = net->ipv4.sysctl_igmp_qrv;
         if (IGMP_V1_SEEN(in_dev) || IGMP_V2_SEEN(in_dev)) {
                 spin_lock_bh(&im->lock);
                 igmp_start_timer(im, IGMP_INITIAL_REPORT_DELAY);
@@ -1391,9 +1392,6 @@ static void __ip_mc_inc_group(struct in_device *in_dev, __be32 addr,
                               unsigned int mode)
 {
         struct ip_mc_list *im;
-#ifdef CONFIG_IP_MULTICAST
-        struct net *net = dev_net(in_dev->dev);
-#endif
 
         ASSERT_RTNL();
 
@@ -1420,7 +1418,6 @@ static void __ip_mc_inc_group(struct in_device *in_dev, __be32 addr,
         spin_lock_init(&im->lock);
 #ifdef CONFIG_IP_MULTICAST
         timer_setup(&im->timer, igmp_timer_expire, 0);
-        im->unsolicit_count = net->ipv4.sysctl_igmp_qrv;
 #endif
 
         im->next_rcu = in_dev->mc_list;
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 51a5d06085ac..ae714aecc31c 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -1508,11 +1508,14 @@ nla_put_failure:
 
 static void erspan_setup(struct net_device *dev)
 {
+        struct ip_tunnel *t = netdev_priv(dev);
+
         ether_setup(dev);
         dev->netdev_ops = &erspan_netdev_ops;
         dev->priv_flags &= ~IFF_TX_SKB_SHARING;
         dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
         ip_tunnel_setup(dev, erspan_net_id);
+        t->erspan_ver = 1;
 }
 
 static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index 75ef332a7caf..12affb7864d9 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -184,8 +184,9 @@ kill:
                                 inet_twsk_deschedule_put(tw);
                                 return TCP_TW_SUCCESS;
                         }
+                } else {
+                        inet_twsk_reschedule(tw, TCP_TIMEWAIT_LEN);
                 }
-                inet_twsk_reschedule(tw, TCP_TIMEWAIT_LEN);
 
                 if (tmp_opt.saw_tstamp) {
                         tcptw->tw_ts_recent       = tmp_opt.rcv_tsval;
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 673bba31eb18..9a4261e50272 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -938,14 +938,14 @@ static int __init inet6_init(void)
 
         err = proto_register(&pingv6_prot, 1);
         if (err)
-                goto out_unregister_ping_proto;
+                goto out_unregister_raw_proto;
 
         /* We MUST register RAW sockets before we create the ICMP6,
          * IGMP6, or NDISC control sockets.
          */
         err = rawv6_init();
         if (err)
-                goto out_unregister_raw_proto;
+                goto out_unregister_ping_proto;
 
         /* Register the family here so that the init calls below will
          * be able to create sockets. (?? is this dangerous ??)
@@ -1113,11 +1113,11 @@ netfilter_fail:
 igmp_fail:
         ndisc_cleanup();
 ndisc_fail:
-        ip6_mr_cleanup();
+        icmpv6_cleanup();
 icmp_fail:
-        unregister_pernet_subsys(&inet6_net_ops);
+        ip6_mr_cleanup();
 ipmr_fail:
-        icmpv6_cleanup();
+        unregister_pernet_subsys(&inet6_net_ops);
 register_pernet_fail:
         sock_unregister(PF_INET6);
         rtnl_unregister_all(PF_INET6);
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index c861a6d4671d..5516f55e214b 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -989,7 +989,10 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt,
                                         fib6_clean_expires(iter);
                                 else
                                         fib6_set_expires(iter, rt->expires);
-                                fib6_metric_set(iter, RTAX_MTU, rt->fib6_pmtu);
+
+                                if (rt->fib6_pmtu)
+                                        fib6_metric_set(iter, RTAX_MTU,
+                                                        rt->fib6_pmtu);
                                 return -EEXIST;
                         }
                         /* If we have the same destination and the same metric,
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 18a3794b0f52..e493b041d4ac 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -1778,6 +1778,7 @@ static void ip6gre_netlink_parms(struct nlattr *data[],
         if (data[IFLA_GRE_COLLECT_METADATA])
                 parms->collect_md = true;
 
+        parms->erspan_ver = 1;
         if (data[IFLA_GRE_ERSPAN_VER])
                 parms->erspan_ver = nla_get_u8(data[IFLA_GRE_ERSPAN_VER]);
 
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 5df2a58d945c..419960b0ba16 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1188,7 +1188,15 @@ route_lookup:
                 init_tel_txopt(&opt, encap_limit);
                 ipv6_push_frag_opts(skb, &opt.ops, &proto);
         }
-        hop_limit = hop_limit ? : ip6_dst_hoplimit(dst);
+
+        if (hop_limit == 0) {
+                if (skb->protocol == htons(ETH_P_IP))
+                        hop_limit = ip_hdr(skb)->ttl;
+                else if (skb->protocol == htons(ETH_P_IPV6))
+                        hop_limit = ipv6_hdr(skb)->hop_limit;
+                else
+                        hop_limit = ip6_dst_hoplimit(dst);
+        }
 
         /* Calculate max headroom for all the headers and adjust
          * needed_headroom if necessary.
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index 5095367c7204..eeaf7455d51e 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -481,7 +481,7 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)
         }
 
         mtu = dst_mtu(dst);
-        if (!skb->ignore_df && skb->len > mtu) {
+        if (skb->len > mtu) {
                 skb_dst_update_pmtu(skb, mtu);
 
                 if (skb->protocol == htons(ETH_P_IPV6)) {
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index b5f385d2b0e9..0fa62acc923c 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -996,7 +996,6 @@ static void ip6_rt_copy_init(struct rt6_info *rt, struct fib6_info *ort)
         rt->rt6i_src = ort->fib6_src;
 #endif
         rt->rt6i_prefsrc = ort->fib6_prefsrc;
-        rt->dst.lwtstate = lwtstate_get(ort->fib6_nh.nh_lwtstate);
 }
 
 static struct fib6_node* fib6_backtrack(struct fib6_node *fn,
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 6449a1c2283b..f0f5fedb8caa 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -947,8 +947,8 @@ static void ieee80211_rx_mgmt_deauth_ibss(struct ieee80211_sub_if_data *sdata,
         if (len < IEEE80211_DEAUTH_FRAME_LEN)
                 return;
 
-        ibss_dbg(sdata, "RX DeAuth SA=%pM DA=%pM BSSID=%pM (reason: %d)\n",
-                 mgmt->sa, mgmt->da, mgmt->bssid, reason);
+        ibss_dbg(sdata, "RX DeAuth SA=%pM DA=%pM\n", mgmt->sa, mgmt->da);
+        ibss_dbg(sdata, "\tBSSID=%pM (reason: %d)\n", mgmt->bssid, reason);
         sta_info_destroy_addr(sdata, mgmt->sa);
 }
 
@@ -966,9 +966,9 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
         auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);
         auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);
 
-        ibss_dbg(sdata,
-                 "RX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=%d)\n",
-                 mgmt->sa, mgmt->da, mgmt->bssid, auth_transaction);
+        ibss_dbg(sdata, "RX Auth SA=%pM DA=%pM\n", mgmt->sa, mgmt->da);
+        ibss_dbg(sdata, "\tBSSID=%pM (auth_transaction=%d)\n",
+                 mgmt->bssid, auth_transaction);
 
         if (auth_alg != WLAN_AUTH_OPEN || auth_transaction != 1)
                 return;
@@ -1175,10 +1175,10 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                 rx_timestamp = drv_get_tsf(local, sdata);
         }
 
-        ibss_dbg(sdata,
-                 "RX beacon SA=%pM BSSID=%pM TSF=0x%llx BCN=0x%llx diff=%lld @%lu\n",
+        ibss_dbg(sdata, "RX beacon SA=%pM BSSID=%pM TSF=0x%llx\n",
                  mgmt->sa, mgmt->bssid,
-                 (unsigned long long)rx_timestamp,
+                 (unsigned long long)rx_timestamp);
+        ibss_dbg(sdata, "\tBCN=0x%llx diff=%lld @%lu\n",
                  (unsigned long long)beacon_timestamp,
                  (unsigned long long)(rx_timestamp - beacon_timestamp),
                  jiffies);
@@ -1537,9 +1537,9 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
 
         tx_last_beacon = drv_tx_last_beacon(local);
 
-        ibss_dbg(sdata,
-                 "RX ProbeReq SA=%pM DA=%pM BSSID=%pM (tx_last_beacon=%d)\n",
-                 mgmt->sa, mgmt->da, mgmt->bssid, tx_last_beacon);
+        ibss_dbg(sdata, "RX ProbeReq SA=%pM DA=%pM\n", mgmt->sa, mgmt->da);
+        ibss_dbg(sdata, "\tBSSID=%pM (tx_last_beacon=%d)\n",
+                 mgmt->bssid, tx_last_beacon);
 
         if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da))
                 return;
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index e1215416a207..2d51eca46aa0 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -256,8 +256,27 @@ static void ieee80211_restart_work(struct work_struct *work)
 
         flush_work(&local->radar_detected_work);
         rtnl_lock();
-        list_for_each_entry(sdata, &local->interfaces, list)
+        list_for_each_entry(sdata, &local->interfaces, list) {
+                /*
+                 * XXX: there may be more work for other vif types and even
+                 * for station mode: a good thing would be to run most of
+                 * the iface type's dependent _stop (ieee80211_mg_stop,
+                 * ieee80211_ibss_stop) etc...
+                 * For now, fix only the specific bug that was seen: race
+                 * between csa_connection_drop_work and us.
+                 */
+                if (sdata->vif.type == NL80211_IFTYPE_STATION) {
+                        /*
+                         * This worker is scheduled from the iface worker that
+                         * runs on mac80211's workqueue, so we can't be
+                         * scheduling this worker after the cancel right here.
+                         * The exception is ieee80211_chswitch_done.
+                         * Then we can have a race...
+                         */
+                        cancel_work_sync(&sdata->u.mgd.csa_connection_drop_work);
+                }
                 flush_delayed_work(&sdata->dec_tailroom_needed_wk);
+        }
         ieee80211_scan_cancel(local);
 
         /* make sure any new ROC will consider local->in_reconfig */
@@ -471,10 +490,7 @@ static const struct ieee80211_vht_cap mac80211_vht_capa_mod_mask = {
                 cpu_to_le32(IEEE80211_VHT_CAP_RXLDPC |
                             IEEE80211_VHT_CAP_SHORT_GI_80 |
                             IEEE80211_VHT_CAP_SHORT_GI_160 |
-                            IEEE80211_VHT_CAP_RXSTBC_1 |
-                            IEEE80211_VHT_CAP_RXSTBC_2 |
-                            IEEE80211_VHT_CAP_RXSTBC_3 |
-                            IEEE80211_VHT_CAP_RXSTBC_4 |
+                            IEEE80211_VHT_CAP_RXSTBC_MASK |
                             IEEE80211_VHT_CAP_TXSTBC |
                             IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |
                             IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |
@@ -1212,6 +1228,7 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
 #if IS_ENABLED(CONFIG_IPV6)
         unregister_inet6addr_notifier(&local->ifa6_notifier);
 #endif
+        ieee80211_txq_teardown_flows(local);
 
         rtnl_lock();
 
@@ -1240,7 +1257,6 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
         skb_queue_purge(&local->skb_queue);
         skb_queue_purge(&local->skb_queue_unreliable);
         skb_queue_purge(&local->skb_queue_tdls_chsw);
-        ieee80211_txq_teardown_flows(local);
 
         destroy_workqueue(local->workqueue);
         wiphy_unregister(local->hw.wiphy);
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 35ad3983ae4b..daf9db3c8f24 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -572,6 +572,10 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
                 forward = false;
                 reply = true;
                 target_metric = 0;
+
+                if (SN_GT(target_sn, ifmsh->sn))
+                        ifmsh->sn = target_sn;
+
                 if (time_after(jiffies, ifmsh->last_sn_update +
                                         net_traversal_jiffies(sdata)) ||
                     time_before(jiffies, ifmsh->last_sn_update)) {
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 7fb9957359a3..3dbecae4be73 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1073,6 +1073,10 @@ static void ieee80211_chswitch_work(struct work_struct *work)
          */
 
         if (sdata->reserved_chanctx) {
+                struct ieee80211_supported_band *sband = NULL;
+                struct sta_info *mgd_sta = NULL;
+                enum ieee80211_sta_rx_bandwidth bw = IEEE80211_STA_RX_BW_20;
+
                 /*
                  * with multi-vif csa driver may call ieee80211_csa_finish()
                  * many times while waiting for other interfaces to use their
@@ -1081,6 +1085,48 @@ static void ieee80211_chswitch_work(struct work_struct *work)
                 if (sdata->reserved_ready)
                         goto out;
 
+                if (sdata->vif.bss_conf.chandef.width !=
+                    sdata->csa_chandef.width) {
+                        /*
+                         * For managed interface, we need to also update the AP
+                         * station bandwidth and align the rate scale algorithm
+                         * on the bandwidth change. Here we only consider the
+                         * bandwidth of the new channel definition (as channel
+                         * switch flow does not have the full HT/VHT/HE
+                         * information), assuming that if additional changes are
+                         * required they would be done as part of the processing
+                         * of the next beacon from the AP.
+                         */
+                        switch (sdata->csa_chandef.width) {
+                        case NL80211_CHAN_WIDTH_20_NOHT:
+                        case NL80211_CHAN_WIDTH_20:
+                        default:
+                                bw = IEEE80211_STA_RX_BW_20;
+                                break;
+                        case NL80211_CHAN_WIDTH_40:
+                                bw = IEEE80211_STA_RX_BW_40;
+                                break;
+                        case NL80211_CHAN_WIDTH_80:
+                                bw = IEEE80211_STA_RX_BW_80;
+                                break;
+                        case NL80211_CHAN_WIDTH_80P80:
+                        case NL80211_CHAN_WIDTH_160:
+                                bw = IEEE80211_STA_RX_BW_160;
+                                break;
+                        }
+
+                        mgd_sta = sta_info_get(sdata, ifmgd->bssid);
+                        sband =
+                                local->hw.wiphy->bands[sdata->csa_chandef.chan->band];
+                }
+
+                if (sdata->vif.bss_conf.chandef.width >
+                    sdata->csa_chandef.width) {
+                        mgd_sta->sta.bandwidth = bw;
+                        rate_control_rate_update(local, sband, mgd_sta,
+                                                 IEEE80211_RC_BW_CHANGED);
+                }
+
                 ret = ieee80211_vif_use_reserved_context(sdata);
                 if (ret) {
                         sdata_info(sdata,
@@ -1091,6 +1137,13 @@ static void ieee80211_chswitch_work(struct work_struct *work)
                         goto out;
                 }
 
+                if (sdata->vif.bss_conf.chandef.width <
+                    sdata->csa_chandef.width) {
+                        mgd_sta->sta.bandwidth = bw;
+                        rate_control_rate_update(local, sband, mgd_sta,
+                                                 IEEE80211_RC_BW_CHANGED);
+                }
+
                 goto out;
         }
 
@@ -1312,6 +1365,16 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
                                          cbss->beacon_interval));
         return;
  drop_connection:
+        /*
+         * This is just so that the disconnect flow will know that
+         * we were trying to switch channel and failed. In case the
+         * mode is 1 (we are not allowed to Tx), we will know not to
+         * send a deauthentication frame. Those two fields will be
+         * reset when the disconnection worker runs.
+         */
+        sdata->vif.csa_active = true;
+        sdata->csa_block_tx = csa_ie.mode;
+
         ieee80211_queue_work(&local->hw, &ifmgd->csa_connection_drop_work);
         mutex_unlock(&local->chanctx_mtx);
         mutex_unlock(&local->mtx);
@@ -2522,6 +2585,7 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata)
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
         u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
+        bool tx;
 
         sdata_lock(sdata);
         if (!ifmgd->associated) {
@@ -2529,6 +2593,8 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata)
                 return;
         }
 
+        tx = !sdata->csa_block_tx;
+
         /* AP is probably out of range (or not reachable for another reason) so
          * remove the bss struct for that AP.
          */
@@ -2536,7 +2602,7 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata)
 
         ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
                                WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY,
-                               true, frame_buf);
+                               tx, frame_buf);
         mutex_lock(&local->mtx);
         sdata->vif.csa_active = false;
         ifmgd->csa_waiting_bcn = false;
@@ -2547,7 +2613,7 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata)
         }
         mutex_unlock(&local->mtx);
 
-        ieee80211_report_disconnect(sdata, frame_buf, sizeof(frame_buf), true,
+        ieee80211_report_disconnect(sdata, frame_buf, sizeof(frame_buf), tx,
                                     WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);
 
         sdata_unlock(sdata);
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 134bbbc9cd6e..355357cc7dbd 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1728,6 +1728,7 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
          */
         if (!ieee80211_hw_check(&sta->local->hw, AP_LINK_PS) &&
             !ieee80211_has_morefrags(hdr->frame_control) &&
+            !is_multicast_ether_addr(hdr->addr1) &&
             (ieee80211_is_mgmt(hdr->frame_control) ||
              ieee80211_is_data(hdr->frame_control)) &&
             !(status->rx_flags & IEEE80211_RX_DEFERRED_RELEASE) &&
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 093108077edc..58502d29be54 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -3078,27 +3078,18 @@ void ieee80211_clear_fast_xmit(struct sta_info *sta)
 }
 
 static bool ieee80211_amsdu_realloc_pad(struct ieee80211_local *local,
-                                        struct sk_buff *skb, int headroom,
-                                        int *subframe_len)
+                                        struct sk_buff *skb, int headroom)
 {
-        int amsdu_len = *subframe_len + sizeof(struct ethhdr);
-        int padding = (4 - amsdu_len) & 3;
-
-        if (skb_headroom(skb) < headroom || skb_tailroom(skb) < padding) {
+        if (skb_headroom(skb) < headroom) {
                 I802_DEBUG_INC(local->tx_expand_skb_head);
 
-                if (pskb_expand_head(skb, headroom, padding, GFP_ATOMIC)) {
+                if (pskb_expand_head(skb, headroom, 0, GFP_ATOMIC)) {
                         wiphy_debug(local->hw.wiphy,
                                     "failed to reallocate TX buffer\n");
                         return false;
                 }
         }
 
-        if (padding) {
-                *subframe_len += padding;
-                skb_put_zero(skb, padding);
-        }
-
         return true;
 }
 
@@ -3122,8 +3113,7 @@ static bool ieee80211_amsdu_prepare_head(struct ieee80211_sub_if_data *sdata,
         if (info->control.flags & IEEE80211_TX_CTRL_AMSDU)
                 return true;
 
-        if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(*amsdu_hdr),
-                                         &subframe_len))
+        if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(*amsdu_hdr)))
                 return false;
 
         data = skb_push(skb, sizeof(*amsdu_hdr));
@@ -3189,7 +3179,8 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata,
         void *data;
         bool ret = false;
         unsigned int orig_len;
-        int n = 1, nfrags;
+        int n = 2, nfrags, pad = 0;
+        u16 hdrlen;
 
         if (!ieee80211_hw_check(&local->hw, TX_AMSDU))
                 return false;
@@ -3222,9 +3213,6 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata,
         if (skb->len + head->len > max_amsdu_len)
                 goto out;
 
-        if (!ieee80211_amsdu_prepare_head(sdata, fast_tx, head))
-                goto out;
-
         nfrags = 1 + skb_shinfo(skb)->nr_frags;
         nfrags += 1 + skb_shinfo(head)->nr_frags;
         frag_tail = &skb_shinfo(head)->frag_list;
@@ -3240,10 +3228,24 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata,
         if (max_frags && nfrags > max_frags)
                 goto out;
 
-        if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(rfc1042_header) + 2,
-                                         &subframe_len))
+        if (!ieee80211_amsdu_prepare_head(sdata, fast_tx, head))
                 goto out;
 
+        /*
+         * Pad out the previous subframe to a multiple of 4 by adding the
+         * padding to the next one, that's being added. Note that head->len
+         * is the length of the full A-MSDU, but that works since each time
+         * we add a new subframe we pad out the previous one to a multiple
+         * of 4 and thus it no longer matters in the next round.
+         */
+        hdrlen = fast_tx->hdr_len - sizeof(rfc1042_header);
+        if ((head->len - hdrlen) & 3)
+                pad = 4 - ((head->len - hdrlen) & 3);
+
+        if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(rfc1042_header) +
+                                                     2 + pad))
+                goto out_recalc;
+
         ret = true;
         data = skb_push(skb, ETH_ALEN + 2);
         memmove(data, data + ETH_ALEN + 2, 2 * ETH_ALEN);
@@ -3253,15 +3255,19 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata,
         memcpy(data, &len, 2);
         memcpy(data + 2, rfc1042_header, sizeof(rfc1042_header));
 
+        memset(skb_push(skb, pad), 0, pad);
+
         head->len += skb->len;
         head->data_len += skb->len;
         *frag_tail = skb;
 
-        flow->backlog += head->len - orig_len;
-        tin->backlog_bytes += head->len - orig_len;
-
-        fq_recalc_backlog(fq, tin, flow);
+out_recalc:
+        if (head->len != orig_len) {
+                flow->backlog += head->len - orig_len;
+                tin->backlog_bytes += head->len - orig_len;
 
+                fq_recalc_backlog(fq, tin, flow);
+        }
 out:
         spin_unlock_bh(&fq->lock);
 
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index d886789ff59e..b51fdcb5adf9 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1235,7 +1235,7 @@ void ieee80211_regulatory_limit_wmm_params(struct ieee80211_sub_if_data *sdata,
 {
         struct ieee80211_chanctx_conf *chanctx_conf;
         const struct ieee80211_reg_rule *rrule;
-        struct ieee80211_wmm_ac *wmm_ac;
+        const struct ieee80211_wmm_ac *wmm_ac;
         u16 center_freq = 0;
 
         if (sdata->vif.type != NL80211_IFTYPE_AP &&
@@ -1254,20 +1254,19 @@ void ieee80211_regulatory_limit_wmm_params(struct ieee80211_sub_if_data *sdata,
 
         rrule = freq_reg_info(sdata->wdev.wiphy, MHZ_TO_KHZ(center_freq));
 
-        if (IS_ERR_OR_NULL(rrule) || !rrule->wmm_rule) {
+        if (IS_ERR_OR_NULL(rrule) || !rrule->has_wmm) {
                 rcu_read_unlock();
                 return;
         }
 
         if (sdata->vif.type == NL80211_IFTYPE_AP)
-                wmm_ac = &rrule->wmm_rule->ap[ac];
+                wmm_ac = &rrule->wmm_rule.ap[ac];
         else
-                wmm_ac = &rrule->wmm_rule->client[ac];
+                wmm_ac = &rrule->wmm_rule.client[ac];
         qparam->cw_min = max_t(u16, qparam->cw_min, wmm_ac->cw_min);
         qparam->cw_max = max_t(u16, qparam->cw_max, wmm_ac->cw_max);
         qparam->aifs = max_t(u8, qparam->aifs, wmm_ac->aifsn);
-        qparam->txop = !qparam->txop ? wmm_ac->cot / 32 :
-                min_t(u16, qparam->txop, wmm_ac->cot / 32);
+        qparam->txop = min_t(u16, qparam->txop, wmm_ac->cot / 32);
         rcu_read_unlock();
 }
 
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 5610061e7f2e..75c92a87e7b2 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -4137,36 +4137,52 @@ static const struct vm_operations_struct packet_mmap_ops = {
         .close  =       packet_mm_close,
 };
 
-static void free_pg_vec(struct pgv *pg_vec, unsigned int len)
+static void free_pg_vec(struct pgv *pg_vec, unsigned int order,
+                        unsigned int len)
 {
         int i;
 
         for (i = 0; i < len; i++) {
                 if (likely(pg_vec[i].buffer)) {
-                        kvfree(pg_vec[i].buffer);
+                        if (is_vmalloc_addr(pg_vec[i].buffer))
+                                vfree(pg_vec[i].buffer);
+                        else
+                                free_pages((unsigned long)pg_vec[i].buffer,
+                                           order);
                         pg_vec[i].buffer = NULL;
                 }
         }
         kfree(pg_vec);
 }
 
-static char *alloc_one_pg_vec_page(unsigned long size)
+static char *alloc_one_pg_vec_page(unsigned long order)
 {
         char *buffer;
+        gfp_t gfp_flags = GFP_KERNEL | __GFP_COMP |
+                          __GFP_ZERO | __GFP_NOWARN | __GFP_NORETRY;
 
-        buffer = kvzalloc(size, GFP_KERNEL);
+        buffer = (char *) __get_free_pages(gfp_flags, order);
         if (buffer)
                 return buffer;
 
-        buffer = kvzalloc(size, GFP_KERNEL | __GFP_RETRY_MAYFAIL);
+        /* __get_free_pages failed, fall back to vmalloc */
+        buffer = vzalloc(array_size((1 << order), PAGE_SIZE));
+        if (buffer)
+                return buffer;
 
-        return buffer;
+        /* vmalloc failed, lets dig into swap here */
+        gfp_flags &= ~__GFP_NORETRY;
+        buffer = (char *) __get_free_pages(gfp_flags, order);
+        if (buffer)
+                return buffer;
+
+        /* complete and utter failure */
+        return NULL;
 }
 
-static struct pgv *alloc_pg_vec(struct tpacket_req *req)
+static struct pgv *alloc_pg_vec(struct tpacket_req *req, int order)
 {
         unsigned int block_nr = req->tp_block_nr;
-        unsigned long size = req->tp_block_size;
         struct pgv *pg_vec;
         int i;
 
@@ -4175,7 +4191,7 @@ static struct pgv *alloc_pg_vec(struct tpacket_req *req)
                 goto out;
 
         for (i = 0; i < block_nr; i++) {
-                pg_vec[i].buffer = alloc_one_pg_vec_page(size);
+                pg_vec[i].buffer = alloc_one_pg_vec_page(order);
                 if (unlikely(!pg_vec[i].buffer))
                         goto out_free_pgvec;
         }
@@ -4184,7 +4200,7 @@ out:
         return pg_vec;
 
 out_free_pgvec:
-        free_pg_vec(pg_vec, block_nr);
+        free_pg_vec(pg_vec, order, block_nr);
         pg_vec = NULL;
         goto out;
 }
@@ -4194,9 +4210,9 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
 {
         struct pgv *pg_vec = NULL;
         struct packet_sock *po = pkt_sk(sk);
+        int was_running, order = 0;
         struct packet_ring_buffer *rb;
         struct sk_buff_head *rb_queue;
-        int was_running;
         __be16 num;
         int err = -EINVAL;
         /* Added to avoid minimal code churn */
@@ -4258,7 +4274,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
                         goto out;
 
                 err = -ENOMEM;
-                pg_vec = alloc_pg_vec(req);
+                order = get_order(req->tp_block_size);
+                pg_vec = alloc_pg_vec(req, order);
                 if (unlikely(!pg_vec))
                         goto out;
                 switch (po->tp_version) {
@@ -4312,6 +4329,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
                 rb->frame_size = req->tp_frame_size;
                 spin_unlock_bh(&rb_queue->lock);
 
+                swap(rb->pg_vec_order, order);
                 swap(rb->pg_vec_len, req->tp_block_nr);
 
                 rb->pg_vec_pages = req->tp_block_size/PAGE_SIZE;
@@ -4337,7 +4355,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
         }
 
         if (pg_vec)
-                free_pg_vec(pg_vec, req->tp_block_nr);
+                free_pg_vec(pg_vec, order, req->tp_block_nr);
 out:
         return err;
 }
diff --git a/net/packet/internal.h b/net/packet/internal.h
index 8f50036f62f0..3bb7c5fb3bff 100644
--- a/net/packet/internal.h
+++ b/net/packet/internal.h
@@ -64,6 +64,7 @@ struct packet_ring_buffer {
         unsigned int            frame_size;
         unsigned int            frame_max;
 
+        unsigned int            pg_vec_order;
         unsigned int            pg_vec_pages;
         unsigned int            pg_vec_len;
 
diff --git a/net/rds/Kconfig b/net/rds/Kconfig
index 01b3bd6a3708..b9092111bc45 100644
--- a/net/rds/Kconfig
+++ b/net/rds/Kconfig
@@ -1,6 +1,6 @@
 
 config RDS
-        tristate "The RDS Protocol"
+        tristate "The Reliable Datagram Sockets Protocol"
         depends on INET
         ---help---
           The RDS (Reliable Datagram Sockets) protocol provides reliable,
diff --git a/net/rds/ib.c b/net/rds/ib.c
index c1d97640c0be..eba75c1ba359 100644
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -341,15 +341,10 @@ static int rds6_ib_conn_info_visitor(struct rds_connection *conn,
 
         if (rds_conn_state(conn) == RDS_CONN_UP) {
                 struct rds_ib_device *rds_ibdev;
-                struct rdma_dev_addr *dev_addr;
 
                 ic = conn->c_transport_data;
-                dev_addr = &ic->i_cm_id->route.addr.dev_addr;
-                rdma_addr_get_sgid(dev_addr,
-                                   (union ib_gid *)&iinfo6->src_gid);
-                rdma_addr_get_dgid(dev_addr,
-                                   (union ib_gid *)&iinfo6->dst_gid);
-
+                rdma_read_gids(ic->i_cm_id, (union ib_gid *)&iinfo6->src_gid,
+                               (union ib_gid *)&iinfo6->dst_gid);
                 rds_ibdev = ic->rds_ibdev;
                 iinfo6->max_send_wr = ic->i_send_ring.w_nr;
                 iinfo6->max_recv_wr = ic->i_recv_ring.w_nr;
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 00192a996be0..0f8465852254 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -20,6 +20,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/mod_devicetable.h>
 #include <linux/rfkill.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 398c752ff529..6f118d62c731 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -662,6 +662,13 @@ int tcf_action_destroy(struct tc_action *actions[], int bind)
         return ret;
 }
 
+static int tcf_action_destroy_1(struct tc_action *a, int bind)
+{
+        struct tc_action *actions[] = { a, NULL };
+
+        return tcf_action_destroy(actions, bind);
+}
+
 static int tcf_action_put(struct tc_action *p)
 {
         return __tcf_action_put(p, false);
@@ -881,17 +888,16 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
         if (TC_ACT_EXT_CMP(a->tcfa_action, TC_ACT_GOTO_CHAIN)) {
                 err = tcf_action_goto_chain_init(a, tp);
                 if (err) {
-                        struct tc_action *actions[] = { a, NULL };
-
-                        tcf_action_destroy(actions, bind);
+                        tcf_action_destroy_1(a, bind);
                         NL_SET_ERR_MSG(extack, "Failed to init TC action chain");
                         return ERR_PTR(err);
                 }
         }
 
         if (!tcf_action_valid(a->tcfa_action)) {
-                NL_SET_ERR_MSG(extack, "invalid action value, using TC_ACT_UNSPEC instead");
-                a->tcfa_action = TC_ACT_UNSPEC;
+                tcf_action_destroy_1(a, bind);
+                NL_SET_ERR_MSG(extack, "Invalid control action value");
+                return ERR_PTR(-EINVAL);
         }
 
         return a;
@@ -1175,6 +1181,7 @@ static int tcf_action_delete(struct net *net, struct tc_action *actions[])
                 struct tcf_idrinfo *idrinfo = a->idrinfo;
                 u32 act_index = a->tcfa_index;
 
+                actions[i] = NULL;
                 if (tcf_action_put(a)) {
                         /* last reference, action was deleted concurrently */
                         module_put(ops->owner);
@@ -1186,7 +1193,6 @@ static int tcf_action_delete(struct net *net, struct tc_action *actions[])
                         if (ret < 0)
                                 return ret;
                 }
-                actions[i] = NULL;
         }
         return 0;
 }
diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
index 19454146f60d..30b63fa23ee2 100644
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
@@ -326,6 +326,20 @@ static int __add_metainfo(const struct tcf_meta_ops *ops,
         return ret;
 }
 
+static int add_metainfo_and_get_ops(const struct tcf_meta_ops *ops,
+                                    struct tcf_ife_info *ife, u32 metaid,
+                                    bool exists)
+{
+        int ret;
+
+        if (!try_module_get(ops->owner))
+                return -ENOENT;
+        ret = __add_metainfo(ops, ife, metaid, NULL, 0, true, exists);
+        if (ret)
+                module_put(ops->owner);
+        return ret;
+}
+
 static int add_metainfo(struct tcf_ife_info *ife, u32 metaid, void *metaval,
                         int len, bool exists)
 {
@@ -349,7 +363,7 @@ static int use_all_metadata(struct tcf_ife_info *ife, bool exists)
 
         read_lock(&ife_mod_lock);
         list_for_each_entry(o, &ifeoplist, list) {
-                rc = __add_metainfo(o, ife, o->metaid, NULL, 0, true, exists);
+                rc = add_metainfo_and_get_ops(o, ife, o->metaid, exists);
                 if (rc == 0)
                         installed += 1;
         }
@@ -400,7 +414,6 @@ static void _tcf_ife_cleanup(struct tc_action *a)
         struct tcf_meta_info *e, *n;
 
         list_for_each_entry_safe(e, n, &ife->metalist, metalist) {
-                module_put(e->ops->owner);
                 list_del(&e->metalist);
                 if (e->metaval) {
                         if (e->ops->release)
@@ -408,6 +421,7 @@ static void _tcf_ife_cleanup(struct tc_action *a)
                         else
                                 kfree(e->metaval);
                 }
+                module_put(e->ops->owner);
                 kfree(e);
         }
 }
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 6d6a9450e8ad..da3dd0f68cc2 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -109,16 +109,18 @@ static int tcf_pedit_key_ex_dump(struct sk_buff *skb,
 {
         struct nlattr *keys_start = nla_nest_start(skb, TCA_PEDIT_KEYS_EX);
 
+        if (!keys_start)
+                goto nla_failure;
         for (; n > 0; n--) {
                 struct nlattr *key_start;
 
                 key_start = nla_nest_start(skb, TCA_PEDIT_KEY_EX);
+                if (!key_start)
+                        goto nla_failure;
 
                 if (nla_put_u16(skb, TCA_PEDIT_KEY_EX_HTYPE, keys_ex->htype) ||
-                    nla_put_u16(skb, TCA_PEDIT_KEY_EX_CMD, keys_ex->cmd)) {
-                        nlmsg_trim(skb, keys_start);
-                        return -EINVAL;
-                }
+                    nla_put_u16(skb, TCA_PEDIT_KEY_EX_CMD, keys_ex->cmd))
+                        goto nla_failure;
 
                 nla_nest_end(skb, key_start);
 
@@ -128,6 +130,9 @@ static int tcf_pedit_key_ex_dump(struct sk_buff *skb,
         nla_nest_end(skb, keys_start);
 
         return 0;
+nla_failure:
+        nla_nest_cancel(skb, keys_start);
+        return -EINVAL;
 }
 
 static int tcf_pedit_init(struct net *net, struct nlattr *nla,
@@ -418,7 +423,10 @@ static int tcf_pedit_dump(struct sk_buff *skb, struct tc_action *a,
         opt->bindcnt = atomic_read(&p->tcf_bindcnt) - bind;
 
         if (p->tcfp_keys_ex) {
-                tcf_pedit_key_ex_dump(skb, p->tcfp_keys_ex, p->tcfp_nkeys);
+                if (tcf_pedit_key_ex_dump(skb,
+                                          p->tcfp_keys_ex,
+                                          p->tcfp_nkeys))
+                        goto nla_put_failure;
 
                 if (nla_put(skb, TCA_PEDIT_PARMS_EX, s, opt))
                         goto nla_put_failure;
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 31bd1439cf60..1a67af8a6e8c 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -1252,7 +1252,7 @@ replay:
         }
         chain = tcf_chain_get(block, chain_index, true);
         if (!chain) {
-                NL_SET_ERR_MSG(extack, "Cannot find specified filter chain");
+                NL_SET_ERR_MSG(extack, "Cannot create specified filter chain");
                 err = -ENOMEM;
                 goto errout;
         }
@@ -1399,7 +1399,7 @@ static int tc_del_tfilter(struct sk_buff *skb, struct nlmsghdr *n,
                         goto errout;
                 }
                 NL_SET_ERR_MSG(extack, "Cannot find specified filter chain");
-                err = -EINVAL;
+                err = -ENOENT;
                 goto errout;
         }
 
diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index ef5c9a82d4e8..a644292f9faf 100644
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -215,7 +215,6 @@ static const struct seq_operations sctp_eps_ops = {
 struct sctp_ht_iter {
         struct seq_net_private p;
         struct rhashtable_iter hti;
-        int start_fail;
 };
 
 static void *sctp_transport_seq_start(struct seq_file *seq, loff_t *pos)
@@ -224,7 +223,6 @@ static void *sctp_transport_seq_start(struct seq_file *seq, loff_t *pos)
 
         sctp_transport_walk_start(&iter->hti);
 
-        iter->start_fail = 0;
         return sctp_transport_get_idx(seq_file_net(seq), &iter->hti, *pos);
 }
 
@@ -232,8 +230,6 @@ static void sctp_transport_seq_stop(struct seq_file *seq, void *v)
 {
         struct sctp_ht_iter *iter = seq->private;
 
-        if (iter->start_fail)
-                return;
         sctp_transport_walk_stop(&iter->hti);
 }
 
@@ -264,8 +260,6 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
         }
 
         transport = (struct sctp_transport *)v;
-        if (!sctp_transport_hold(transport))
-                return 0;
         assoc = transport->asoc;
         epb = &assoc->base;
         sk = epb->sk;
@@ -322,8 +316,6 @@ static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)
         }
 
         transport = (struct sctp_transport *)v;
-        if (!sctp_transport_hold(transport))
-                return 0;
         assoc = transport->asoc;
 
         list_for_each_entry_rcu(tsp, &assoc->peer.transport_addr_list,
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index e96b15a66aba..f73e9d38d5ba 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -2658,20 +2658,23 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,
         }
 
         if (params->spp_flags & SPP_IPV6_FLOWLABEL) {
-                if (trans && trans->ipaddr.sa.sa_family == AF_INET6) {
-                        trans->flowlabel = params->spp_ipv6_flowlabel &
-                                           SCTP_FLOWLABEL_VAL_MASK;
-                        trans->flowlabel |= SCTP_FLOWLABEL_SET_MASK;
-                } else if (asoc) {
-                        list_for_each_entry(trans,
-                                            &asoc->peer.transport_addr_list,
-                                            transports) {
-                                if (trans->ipaddr.sa.sa_family != AF_INET6)
-                                        continue;
+                if (trans) {
+                        if (trans->ipaddr.sa.sa_family == AF_INET6) {
                                 trans->flowlabel = params->spp_ipv6_flowlabel &
                                                    SCTP_FLOWLABEL_VAL_MASK;
                                 trans->flowlabel |= SCTP_FLOWLABEL_SET_MASK;
                         }
+                } else if (asoc) {
+                        struct sctp_transport *t;
+
+                        list_for_each_entry(t, &asoc->peer.transport_addr_list,
+                                            transports) {
+                                if (t->ipaddr.sa.sa_family != AF_INET6)
+                                        continue;
+                                t->flowlabel = params->spp_ipv6_flowlabel &
+                                               SCTP_FLOWLABEL_VAL_MASK;
+                                t->flowlabel |= SCTP_FLOWLABEL_SET_MASK;
+                        }
                         asoc->flowlabel = params->spp_ipv6_flowlabel &
                                           SCTP_FLOWLABEL_VAL_MASK;
                         asoc->flowlabel |= SCTP_FLOWLABEL_SET_MASK;
@@ -2687,12 +2690,13 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,
                         trans->dscp = params->spp_dscp & SCTP_DSCP_VAL_MASK;
                         trans->dscp |= SCTP_DSCP_SET_MASK;
                 } else if (asoc) {
-                        list_for_each_entry(trans,
-                                            &asoc->peer.transport_addr_list,
+                        struct sctp_transport *t;
+
+                        list_for_each_entry(t, &asoc->peer.transport_addr_list,
                                             transports) {
-                                trans->dscp = params->spp_dscp &
-                                              SCTP_DSCP_VAL_MASK;
-                                trans->dscp |= SCTP_DSCP_SET_MASK;
+                                t->dscp = params->spp_dscp &
+                                          SCTP_DSCP_VAL_MASK;
+                                t->dscp |= SCTP_DSCP_SET_MASK;
                         }
                         asoc->dscp = params->spp_dscp & SCTP_DSCP_VAL_MASK;
                         asoc->dscp |= SCTP_DSCP_SET_MASK;
@@ -5005,9 +5009,14 @@ struct sctp_transport *sctp_transport_get_next(struct net *net,
                         break;
                 }
 
+                if (!sctp_transport_hold(t))
+                        continue;
+
                 if (net_eq(sock_net(t->asoc->base.sk), net) &&
                     t->asoc->peer.primary_path == t)
                         break;
+
+                sctp_transport_put(t);
         }
 
         return t;
@@ -5017,13 +5026,18 @@ struct sctp_transport *sctp_transport_get_idx(struct net *net,
                                               struct rhashtable_iter *iter,
                                               int pos)
 {
-        void *obj = SEQ_START_TOKEN;
+        struct sctp_transport *t;
 
-        while (pos && (obj = sctp_transport_get_next(net, iter)) &&
-               !IS_ERR(obj))
-                pos--;
+        if (!pos)
+                return SEQ_START_TOKEN;
 
-        return obj;
+        while ((t = sctp_transport_get_next(net, iter)) && !IS_ERR(t)) {
+                if (!--pos)
+                        break;
+                sctp_transport_put(t);
+        }
+
+        return t;
 }
 
 int sctp_for_each_endpoint(int (*cb)(struct sctp_endpoint *, void *),
@@ -5082,8 +5096,6 @@ again:
 
         tsp = sctp_transport_get_idx(net, &hti, *pos + 1);
         for (; !IS_ERR_OR_NULL(tsp); tsp = sctp_transport_get_next(net, &hti)) {
-                if (!sctp_transport_hold(tsp))
-                        continue;
                 ret = cb(tsp, p);
                 if (ret)
                         break;
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 9ee6cfea56dd..d8026543bf4c 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -51,12 +51,12 @@ const char tipc_bclink_name[] = "broadcast-link";
  * struct tipc_bc_base - base structure for keeping broadcast send state
  * @link: broadcast send link structure
  * @inputq: data input queue; will only carry SOCK_WAKEUP messages
- * @dest: array keeping number of reachable destinations per bearer
+ * @dests: array keeping number of reachable destinations per bearer
  * @primary_bearer: a bearer having links to all broadcast destinations, if any
  * @bcast_support: indicates if primary bearer, if any, supports broadcast
  * @rcast_support: indicates if all peer nodes support replicast
  * @rc_ratio: dest count as percentage of cluster size where send method changes
- * @bc_threshold: calculated drom rc_ratio; if dests > threshold use broadcast
+ * @bc_threshold: calculated from rc_ratio; if dests > threshold use broadcast
  */
 struct tipc_bc_base {
         struct tipc_link *link;
diff --git a/net/tipc/diag.c b/net/tipc/diag.c
index aaabb0b776dd..73137f4aeb68 100644
--- a/net/tipc/diag.c
+++ b/net/tipc/diag.c
@@ -84,7 +84,9 @@ static int tipc_sock_diag_handler_dump(struct sk_buff *skb,
 
         if (h->nlmsg_flags & NLM_F_DUMP) {
                 struct netlink_dump_control c = {
+                        .start = tipc_dump_start,
                         .dump = tipc_diag_dump,
+                        .done = tipc_dump_done,
                 };
                 netlink_dump_start(net->diag_nlsk, skb, h, &c);
                 return 0;
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 88f027b502f6..66d5b2c5987a 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -980,20 +980,17 @@ int tipc_nl_name_table_dump(struct sk_buff *skb, struct netlink_callback *cb)
 
 struct tipc_dest *tipc_dest_find(struct list_head *l, u32 node, u32 port)
 {
-        u64 value = (u64)node << 32 | port;
         struct tipc_dest *dst;
 
         list_for_each_entry(dst, l, list) {
-                if (dst->value != value)
-                        continue;
-                return dst;
+                if (dst->node == node && dst->port == port)
+                        return dst;
         }
         return NULL;
 }
 
 bool tipc_dest_push(struct list_head *l, u32 node, u32 port)
 {
-        u64 value = (u64)node << 32 | port;
         struct tipc_dest *dst;
 
         if (tipc_dest_find(l, node, port))
@@ -1002,7 +999,8 @@ bool tipc_dest_push(struct list_head *l, u32 node, u32 port)
         dst = kmalloc(sizeof(*dst), GFP_ATOMIC);
         if (unlikely(!dst))
                 return false;
-        dst->value = value;
+        dst->node = node;
+        dst->port = port;
         list_add(&dst->list, l);
         return true;
 }
diff --git a/net/tipc/name_table.h b/net/tipc/name_table.h
index 0febba41da86..892bd750b85f 100644
--- a/net/tipc/name_table.h
+++ b/net/tipc/name_table.h
@@ -133,13 +133,8 @@ void tipc_nametbl_stop(struct net *net);
 
 struct tipc_dest {
         struct list_head list;
-        union {
-                struct {
-                        u32 port;
-                        u32 node;
-                };
-                u64 value;
-        };
+        u32 port;
+        u32 node;
 };
 
 struct tipc_dest *tipc_dest_find(struct list_head *l, u32 node, u32 port);
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 6ff2254088f6..99ee419210ba 100644
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -167,7 +167,9 @@ static const struct genl_ops tipc_genl_v2_ops[] = {
         },
         {
                 .cmd    = TIPC_NL_SOCK_GET,
+                .start = tipc_dump_start,
                 .dumpit = tipc_nl_sk_dump,
+                .done   = tipc_dump_done,
                 .policy = tipc_nl_policy,
         },
         {
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index c1e93c9515bc..ab7a2a7178f7 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -2672,6 +2672,8 @@ void tipc_sk_reinit(struct net *net)
 
                 rhashtable_walk_stop(&iter);
         } while (tsk == ERR_PTR(-EAGAIN));
+
+        rhashtable_walk_exit(&iter);
 }
 
 static struct tipc_sock *tipc_sk_lookup(struct net *net, u32 portid)
@@ -3227,45 +3229,69 @@ int tipc_nl_sk_walk(struct sk_buff *skb, struct netlink_callback *cb,
                                        struct netlink_callback *cb,
                                        struct tipc_sock *tsk))
 {
-        struct net *net = sock_net(skb->sk);
-        struct tipc_net *tn = tipc_net(net);
-        const struct bucket_table *tbl;
-        u32 prev_portid = cb->args[1];
-        u32 tbl_id = cb->args[0];
-        struct rhash_head *pos;
+        struct rhashtable_iter *iter = (void *)cb->args[0];
         struct tipc_sock *tsk;
         int err;
 
-        rcu_read_lock();
-        tbl = rht_dereference_rcu((&tn->sk_rht)->tbl, &tn->sk_rht);
-        for (; tbl_id < tbl->size; tbl_id++) {
-                rht_for_each_entry_rcu(tsk, pos, tbl, tbl_id, node) {
-                        spin_lock_bh(&tsk->sk.sk_lock.slock);
-                        if (prev_portid && prev_portid != tsk->portid) {
-                                spin_unlock_bh(&tsk->sk.sk_lock.slock);
+        rhashtable_walk_start(iter);
+        while ((tsk = rhashtable_walk_next(iter)) != NULL) {
+                if (IS_ERR(tsk)) {
+                        err = PTR_ERR(tsk);
+                        if (err == -EAGAIN) {
+                                err = 0;
                                 continue;
                         }
+                        break;
+                }
 
-                        err = skb_handler(skb, cb, tsk);
-                        if (err) {
-                                prev_portid = tsk->portid;
-                                spin_unlock_bh(&tsk->sk.sk_lock.slock);
-                                goto out;
-                        }
-
-                        prev_portid = 0;
-                        spin_unlock_bh(&tsk->sk.sk_lock.slock);
+                sock_hold(&tsk->sk);
+                rhashtable_walk_stop(iter);
+                lock_sock(&tsk->sk);
+                err = skb_handler(skb, cb, tsk);
+                if (err) {
+                        release_sock(&tsk->sk);
+                        sock_put(&tsk->sk);
+                        goto out;
                 }
+                release_sock(&tsk->sk);
+                rhashtable_walk_start(iter);
+                sock_put(&tsk->sk);
         }
+        rhashtable_walk_stop(iter);
 out:
-        rcu_read_unlock();
-        cb->args[0] = tbl_id;
-        cb->args[1] = prev_portid;
-
         return skb->len;
 }
 EXPORT_SYMBOL(tipc_nl_sk_walk);
 
+int tipc_dump_start(struct netlink_callback *cb)
+{
+        struct rhashtable_iter *iter = (void *)cb->args[0];
+        struct net *net = sock_net(cb->skb->sk);
+        struct tipc_net *tn = tipc_net(net);
+
+        if (!iter) {
+                iter = kmalloc(sizeof(*iter), GFP_KERNEL);
+                if (!iter)
+                        return -ENOMEM;
+
+                cb->args[0] = (long)iter;
+        }
+
+        rhashtable_walk_enter(&tn->sk_rht, iter);
+        return 0;
+}
+EXPORT_SYMBOL(tipc_dump_start);
+
+int tipc_dump_done(struct netlink_callback *cb)
+{
+        struct rhashtable_iter *hti = (void *)cb->args[0];
+
+        rhashtable_walk_exit(hti);
+        kfree(hti);
+        return 0;
+}
+EXPORT_SYMBOL(tipc_dump_done);
+
 int tipc_sk_fill_sock_diag(struct sk_buff *skb, struct netlink_callback *cb,
                            struct tipc_sock *tsk, u32 sk_filter_state,
                            u64 (*tipc_diag_gen_cookie)(struct sock *sk))
diff --git a/net/tipc/socket.h b/net/tipc/socket.h
index aff9b2ae5a1f..d43032e26532 100644
--- a/net/tipc/socket.h
+++ b/net/tipc/socket.h
@@ -68,4 +68,6 @@ int tipc_nl_sk_walk(struct sk_buff *skb, struct netlink_callback *cb,
                     int (*skb_handler)(struct sk_buff *skb,
                                        struct netlink_callback *cb,
                                        struct tipc_sock *tsk));
+int tipc_dump_start(struct netlink_callback *cb);
+int tipc_dump_done(struct netlink_callback *cb);
 #endif
diff --git a/net/tipc/topsrv.c b/net/tipc/topsrv.c
index c782b352d928..d8956f7daac4 100644
--- a/net/tipc/topsrv.c
+++ b/net/tipc/topsrv.c
@@ -307,8 +307,8 @@ static void tipc_conn_send_work(struct work_struct *work)
         conn_put(con);
 }
 
-/* tipc_conn_queue_evt() - interrupt level call from a subscription instance
- * The queued work is launched into tipc_send_work()->tipc_send_to_sock()
+/* tipc_topsrv_queue_evt() - interrupt level call from a subscription instance
+ * The queued work is launched into tipc_conn_send_work()->tipc_conn_send_to_sock()
  */
 void tipc_topsrv_queue_evt(struct net *net, int conid,
                            u32 event, struct tipc_event *evt)
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 62e6679de481..fbd0747a5a9d 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -669,13 +669,13 @@ static int nl80211_msg_put_wmm_rules(struct sk_buff *msg,
                         goto nla_put_failure;
 
                 if (nla_put_u16(msg, NL80211_WMMR_CW_MIN,
-                                rule->wmm_rule->client[j].cw_min) ||
+                                rule->wmm_rule.client[j].cw_min) ||
                     nla_put_u16(msg, NL80211_WMMR_CW_MAX,
-                                rule->wmm_rule->client[j].cw_max) ||
+                                rule->wmm_rule.client[j].cw_max) ||
                     nla_put_u8(msg, NL80211_WMMR_AIFSN,
-                               rule->wmm_rule->client[j].aifsn) ||
-                    nla_put_u8(msg, NL80211_WMMR_TXOP,
-                               rule->wmm_rule->client[j].cot))
+                               rule->wmm_rule.client[j].aifsn) ||
+                    nla_put_u16(msg, NL80211_WMMR_TXOP,
+                                rule->wmm_rule.client[j].cot))
                         goto nla_put_failure;
 
                 nla_nest_end(msg, nl_wmm_rule);
@@ -766,9 +766,9 @@ static int nl80211_msg_put_channel(struct sk_buff *msg, struct wiphy *wiphy,
 
         if (large) {
                 const struct ieee80211_reg_rule *rule =
-                        freq_reg_info(wiphy, chan->center_freq);
+                        freq_reg_info(wiphy, MHZ_TO_KHZ(chan->center_freq));
 
-                if (!IS_ERR(rule) && rule->wmm_rule) {
+                if (!IS_ERR_OR_NULL(rule) && rule->has_wmm) {
                         if (nl80211_msg_put_wmm_rules(msg, rule))
                                 goto nla_put_failure;
                 }
@@ -12206,6 +12206,7 @@ static int nl80211_update_ft_ies(struct sk_buff *skb, struct genl_info *info)
                 return -EOPNOTSUPP;
 
         if (!info->attrs[NL80211_ATTR_MDID] ||
+            !info->attrs[NL80211_ATTR_IE] ||
             !is_valid_ie_attr(info->attrs[NL80211_ATTR_IE]))
                 return -EINVAL;
 
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 043d43573ca2..7046d922867a 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -425,36 +425,23 @@ static const struct ieee80211_regdomain *
 reg_copy_regd(const struct ieee80211_regdomain *src_regd)
 {
         struct ieee80211_regdomain *regd;
-        int size_of_regd, size_of_wmms;
+        int size_of_regd;
         unsigned int i;
-        struct ieee80211_wmm_rule *d_wmm, *s_wmm;
 
         size_of_regd =
                 sizeof(struct ieee80211_regdomain) +
                 src_regd->n_reg_rules * sizeof(struct ieee80211_reg_rule);
-        size_of_wmms = src_regd->n_wmm_rules *
-                sizeof(struct ieee80211_wmm_rule);
 
-        regd = kzalloc(size_of_regd + size_of_wmms, GFP_KERNEL);
+        regd = kzalloc(size_of_regd, GFP_KERNEL);
         if (!regd)
                 return ERR_PTR(-ENOMEM);
 
         memcpy(regd, src_regd, sizeof(struct ieee80211_regdomain));
 
-        d_wmm = (struct ieee80211_wmm_rule *)((u8 *)regd + size_of_regd);
-        s_wmm = (struct ieee80211_wmm_rule *)((u8 *)src_regd + size_of_regd);
-        memcpy(d_wmm, s_wmm, size_of_wmms);
-
-        for (i = 0; i < src_regd->n_reg_rules; i++) {
+        for (i = 0; i < src_regd->n_reg_rules; i++)
                 memcpy(&regd->reg_rules[i], &src_regd->reg_rules[i],
                        sizeof(struct ieee80211_reg_rule));
-                if (!src_regd->reg_rules[i].wmm_rule)
-                        continue;
 
-                regd->reg_rules[i].wmm_rule = d_wmm +
-                        (src_regd->reg_rules[i].wmm_rule - s_wmm) /
-                        sizeof(struct ieee80211_wmm_rule);
-        }
         return regd;
 }
 
@@ -860,9 +847,10 @@ static bool valid_regdb(const u8 *data, unsigned int size)
         return true;
 }
 
-static void set_wmm_rule(struct ieee80211_wmm_rule *rule,
+static void set_wmm_rule(struct ieee80211_reg_rule *rrule,
                          struct fwdb_wmm_rule *wmm)
 {
+        struct ieee80211_wmm_rule *rule = &rrule->wmm_rule;
         unsigned int i;
 
         for (i = 0; i < IEEE80211_NUM_ACS; i++) {
@@ -876,11 +864,13 @@ static void set_wmm_rule(struct ieee80211_wmm_rule *rule,
                 rule->ap[i].aifsn = wmm->ap[i].aifsn;
                 rule->ap[i].cot = 1000 * be16_to_cpu(wmm->ap[i].cot);
         }
+
+        rrule->has_wmm = true;
 }
 
 static int __regdb_query_wmm(const struct fwdb_header *db,
                              const struct fwdb_country *country, int freq,
-                             u32 *dbptr, struct ieee80211_wmm_rule *rule)
+                             struct ieee80211_reg_rule *rule)
 {
         unsigned int ptr = be16_to_cpu(country->coll_ptr) << 2;
         struct fwdb_collection *coll = (void *)((u8 *)db + ptr);
@@ -901,8 +891,6 @@ static int __regdb_query_wmm(const struct fwdb_header *db,
                         wmm_ptr = be16_to_cpu(rrule->wmm_ptr) << 2;
                         wmm = (void *)((u8 *)db + wmm_ptr);
                         set_wmm_rule(rule, wmm);
-                        if (dbptr)
-                                *dbptr = wmm_ptr;
                         return 0;
                 }
         }
@@ -910,8 +898,7 @@ static int __regdb_query_wmm(const struct fwdb_header *db,
         return -ENODATA;
 }
 
-int reg_query_regdb_wmm(char *alpha2, int freq, u32 *dbptr,
-                        struct ieee80211_wmm_rule *rule)
+int reg_query_regdb_wmm(char *alpha2, int freq, struct ieee80211_reg_rule *rule)
 {
         const struct fwdb_header *hdr = regdb;
         const struct fwdb_country *country;
@@ -925,8 +912,7 @@ int reg_query_regdb_wmm(char *alpha2, int freq, u32 *dbptr,
         country = &hdr->country[0];
         while (country->coll_ptr) {
                 if (alpha2_equal(alpha2, country->alpha2))
-                        return __regdb_query_wmm(regdb, country, freq, dbptr,
-                                                 rule);
+                        return __regdb_query_wmm(regdb, country, freq, rule);
 
                 country++;
         }
@@ -935,32 +921,13 @@ int reg_query_regdb_wmm(char *alpha2, int freq, u32 *dbptr,
 }
 EXPORT_SYMBOL(reg_query_regdb_wmm);
 
-struct wmm_ptrs {
-        struct ieee80211_wmm_rule *rule;
-        u32 ptr;
-};
-
-static struct ieee80211_wmm_rule *find_wmm_ptr(struct wmm_ptrs *wmm_ptrs,
-                                               u32 wmm_ptr, int n_wmms)
-{
-        int i;
-
-        for (i = 0; i < n_wmms; i++) {
-                if (wmm_ptrs[i].ptr == wmm_ptr)
-                        return wmm_ptrs[i].rule;
-        }
-        return NULL;
-}
-
 static int regdb_query_country(const struct fwdb_header *db,
                                const struct fwdb_country *country)
 {
         unsigned int ptr = be16_to_cpu(country->coll_ptr) << 2;
         struct fwdb_collection *coll = (void *)((u8 *)db + ptr);
         struct ieee80211_regdomain *regdom;
-        struct ieee80211_regdomain *tmp_rd;
-        unsigned int size_of_regd, i, n_wmms = 0;
-        struct wmm_ptrs *wmm_ptrs;
+        unsigned int size_of_regd, i;
 
         size_of_regd = sizeof(struct ieee80211_regdomain) +
                 coll->n_rules * sizeof(struct ieee80211_reg_rule);
@@ -969,12 +936,6 @@ static int regdb_query_country(const struct fwdb_header *db,
         if (!regdom)
                 return -ENOMEM;
 
-        wmm_ptrs = kcalloc(coll->n_rules, sizeof(*wmm_ptrs), GFP_KERNEL);
-        if (!wmm_ptrs) {
-                kfree(regdom);
-                return -ENOMEM;
-        }
-
         regdom->n_reg_rules = coll->n_rules;
         regdom->alpha2[0] = country->alpha2[0];
         regdom->alpha2[1] = country->alpha2[1];
@@ -1013,37 +974,11 @@ static int regdb_query_country(const struct fwdb_header *db,
                                 1000 * be16_to_cpu(rule->cac_timeout);
                 if (rule->len >= offsetofend(struct fwdb_rule, wmm_ptr)) {
                         u32 wmm_ptr = be16_to_cpu(rule->wmm_ptr) << 2;
-                        struct ieee80211_wmm_rule *wmm_pos =
-                                find_wmm_ptr(wmm_ptrs, wmm_ptr, n_wmms);
-                        struct fwdb_wmm_rule *wmm;
-                        struct ieee80211_wmm_rule *wmm_rule;
-
-                        if (wmm_pos) {
-                                rrule->wmm_rule = wmm_pos;
-                                continue;
-                        }
-                        wmm = (void *)((u8 *)db + wmm_ptr);
-                        tmp_rd = krealloc(regdom, size_of_regd + (n_wmms + 1) *
-                                          sizeof(struct ieee80211_wmm_rule),
-                                          GFP_KERNEL);
-
-                        if (!tmp_rd) {
-                                kfree(regdom);
-                                kfree(wmm_ptrs);
-                                return -ENOMEM;
-                        }
-                        regdom = tmp_rd;
-
-                        wmm_rule = (struct ieee80211_wmm_rule *)
-                                ((u8 *)regdom + size_of_regd + n_wmms *
-                                sizeof(struct ieee80211_wmm_rule));
+                        struct fwdb_wmm_rule *wmm = (void *)((u8 *)db + wmm_ptr);
 
-                        set_wmm_rule(wmm_rule, wmm);
-                        wmm_ptrs[n_wmms].ptr = wmm_ptr;
-                        wmm_ptrs[n_wmms++].rule = wmm_rule;
+                        set_wmm_rule(rrule, wmm);
                 }
         }
-        kfree(wmm_ptrs);
 
         return reg_schedule_apply(regdom);
 }
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 2a89db5f2db7..4293f980e9c4 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1456,7 +1456,7 @@ bool ieee80211_chandef_to_operating_class(struct cfg80211_chan_def *chandef,
                                           u8 *op_class)
 {
         u8 vht_opclass;
-        u16 freq = chandef->center_freq1;
+        u32 freq = chandef->center_freq1;
 
         if (freq >= 2412 && freq <= 2472) {
                 if (chandef->width > NL80211_CHAN_WIDTH_40)
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index c75413d05a63..ce53639a864a 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -153,10 +153,6 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \
 # Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
 cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))
 
-# cc-if-fullversion
-# Usage:  EXTRA_CFLAGS += $(call cc-if-fullversion, -lt, 040502, -O1)
-cc-if-fullversion = $(shell [ $(cc-fullversion) $(1) $(2) ] && echo $(3) || echo $(4))
-
 # cc-ldoption
 # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
 cc-ldoption = $(call try-run,\
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 1c48572223d1..5a2d1c9578a0 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -246,8 +246,6 @@ objtool_args += --no-fp
 endif
 ifdef CONFIG_GCOV_KERNEL
 objtool_args += --no-unreachable
-else
-objtool_args += $(call cc-ifversion, -lt, 0405, --no-unreachable)
 endif
 ifdef CONFIG_RETPOLINE
 ifneq ($(RETPOLINE_CFLAGS),)
diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
index df175bc33c5d..9c55077ca5dd 100644
--- a/tools/bpf/bpftool/map.c
+++ b/tools/bpf/bpftool/map.c
@@ -68,6 +68,7 @@ static const char * const map_type_name[] = {
         [BPF_MAP_TYPE_DEVMAP]           = "devmap",
         [BPF_MAP_TYPE_SOCKMAP]          = "sockmap",
         [BPF_MAP_TYPE_CPUMAP]           = "cpumap",
+        [BPF_MAP_TYPE_XSKMAP]           = "xskmap",
         [BPF_MAP_TYPE_SOCKHASH]         = "sockhash",
         [BPF_MAP_TYPE_CGROUP_STORAGE]   = "cgroup_storage",
 };
diff --git a/tools/testing/selftests/net/pmtu.sh b/tools/testing/selftests/net/pmtu.sh
index f8cc38afffa2..32a194e3e07a 100755
--- a/tools/testing/selftests/net/pmtu.sh
+++ b/tools/testing/selftests/net/pmtu.sh
@@ -46,6 +46,9 @@
 # Kselftest framework requirement - SKIP code is 4.
 ksft_skip=4
 
+# Some systems don't have a ping6 binary anymore
+which ping6 > /dev/null 2>&1 && ping6=$(which ping6) || ping6=$(which ping)
+
 tests="
         pmtu_vti6_exception             vti6: PMTU exceptions
         pmtu_vti4_exception             vti4: PMTU exceptions
@@ -274,7 +277,7 @@ test_pmtu_vti6_exception() {
         mtu "${ns_b}" veth_b 4000
         mtu "${ns_a}" vti6_a 5000
         mtu "${ns_b}" vti6_b 5000
-        ${ns_a} ping6 -q -i 0.1 -w 2 -s 60000 ${vti6_b_addr} > /dev/null
+        ${ns_a} ${ping6} -q -i 0.1 -w 2 -s 60000 ${vti6_b_addr} > /dev/null
 
         # Check that exception was created
         if [ "$(route_get_dst_pmtu_from_exception "${ns_a}" ${vti6_b_addr})" = "" ]; then
@@ -334,7 +337,7 @@ test_pmtu_vti4_link_add_mtu() {
         fail=0
 
         min=68
-        max=$((65528 - 20))
+        max=$((65535 - 20))
         # Check invalid values first
         for v in $((min - 1)) $((max + 1)); do
                 ${ns_a} ip link add vti4_a mtu ${v} type vti local ${veth4_a_addr} remote ${veth4_b_addr} key 10 2>/dev/null
diff --git a/tools/testing/selftests/tc-testing/tc-tests/actions/police.json b/tools/testing/selftests/tc-testing/tc-tests/actions/police.json
index f03763d81617..30f9b54bd666 100644
--- a/tools/testing/selftests/tc-testing/tc-tests/actions/police.json
+++ b/tools/testing/selftests/tc-testing/tc-tests/actions/police.json
@@ -313,6 +313,54 @@
         ]
     },
     {
+        "id": "6aaf",
+        "name": "Add police actions with conform-exceed control pass/pipe [with numeric values]",
+        "category": [
+            "actions",
+            "police"
+        ],
+        "setup": [
+            [
+                "$TC actions flush action police",
+                0,
+                1,
+                255
+            ]
+        ],
+        "cmdUnderTest": "$TC actions add action police rate 3mbit burst 250k conform-exceed 0/3 index 1",
+        "expExitCode": "0",
+        "verifyCmd": "$TC actions get action police index 1",
+        "matchPattern": "action order [0-9]*:  police 0x1 rate 3Mbit burst 250Kb mtu 2Kb action pass/pipe",
+        "matchCount": "1",
+        "teardown": [
+            "$TC actions flush action police"
+        ]
+    },
+    {
+        "id": "29b1",
+        "name": "Add police actions with conform-exceed control <invalid>/drop",
+        "category": [
+            "actions",
+            "police"
+        ],
+        "setup": [
+            [
+                "$TC actions flush action police",
+                0,
+                1,
+                255
+            ]
+        ],
+        "cmdUnderTest": "$TC actions add action police rate 3mbit burst 250k conform-exceed 10/drop index 1",
+        "expExitCode": "255",
+        "verifyCmd": "$TC actions ls action police",
+        "matchPattern": "action order [0-9]*:  police 0x1 rate 3Mbit burst 250Kb mtu 2Kb action ",
+        "matchCount": "0",
+        "teardown": [
+            "$TC actions flush action police"
+        ]
+    },
+    {
         "id": "c26f",
         "name": "Add police action with invalid peakrate value",
         "category": [