130 files changed, 1024 insertions, 503 deletions

diff --git a/Documentation/devicetree/bindings/input/gpio-keys.txt b/Documentation/devicetree/bindings/input/gpio-keys.txt
index 996ce84352cb..7cccc49b6bea 100644
--- a/Documentation/devicetree/bindings/input/gpio-keys.txt
+++ b/Documentation/devicetree/bindings/input/gpio-keys.txt
@@ -1,4 +1,4 @@
-Device-Tree bindings for input/gpio_keys.c keyboard driver
+Device-Tree bindings for input/keyboard/gpio_keys.c keyboard driver
 
 Required properties:
         - compatible = "gpio-keys";
diff --git a/Documentation/fb/uvesafb.txt b/Documentation/fb/uvesafb.txt
index f6362d88763b..aa924196c366 100644
--- a/Documentation/fb/uvesafb.txt
+++ b/Documentation/fb/uvesafb.txt
@@ -15,7 +15,8 @@ than x86.  Check the v86d documentation for a list of currently supported
 arches.
 
 v86d source code can be downloaded from the following website:
-  http://dev.gentoo.org/~spock/projects/uvesafb
+
+  https://github.com/mjanusz/v86d
 
 Please refer to the v86d documentation for detailed configuration and
 installation instructions.
@@ -177,7 +178,7 @@ from the Video BIOS if you set pixclock to 0 in fb_var_screeninfo.
 
 --
  Michal Januszewski <spock@gentoo.org>
- Last updated: 2009-03-30
+ Last updated: 2017-10-10
 
  Documentation of the uvesafb options is loosely based on vesafb.txt.
 
diff --git a/MAINTAINERS b/MAINTAINERS
index dcb0191c4f54..22065048d89d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1251,7 +1251,7 @@ N:	meson
 
 ARM/Annapurna Labs ALPINE ARCHITECTURE
 M:      Tsahee Zidenberg <tsahee@annapurnalabs.com>
-M:      Antoine Tenart <antoine.tenart@free-electrons.com>
+M:      Antoine Tenart <antoine.tenart@bootlin.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-alpine/
@@ -9717,13 +9717,6 @@ Q:	http://patchwork.linuxtv.org/project/linux-media/list/
 S:      Maintained
 F:      drivers/media/dvb-frontends/mn88473*
 
-PCI DRIVER FOR MOBIVEIL PCIE IP
-M:      Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
-L:      linux-pci@vger.kernel.org
-S:      Supported
-F:      Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
-F:      drivers/pci/controller/pcie-mobiveil.c
-
 MODULE SUPPORT
 M:      Jessica Yu <jeyu@kernel.org>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
@@ -10950,7 +10943,7 @@ M:	Willy Tarreau <willy@haproxy.com>
 M:      Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
 S:      Odd Fixes
 F:      Documentation/auxdisplay/lcd-panel-cgram.txt
-F:      drivers/misc/panel.c
+F:      drivers/auxdisplay/panel.c
 
 PARALLEL PORT SUBSYSTEM
 M:      Sudip Mukherjee <sudipm.mukherjee@gmail.com>
@@ -11138,6 +11131,13 @@ F:	include/uapi/linux/switchtec_ioctl.h
 F:      include/linux/switchtec.h
 F:      drivers/ntb/hw/mscc/
 
+PCI DRIVER FOR MOBIVEIL PCIE IP
+M:      Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
+L:      linux-pci@vger.kernel.org
+S:      Supported
+F:      Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
+F:      drivers/pci/controller/pcie-mobiveil.c
+
 PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
 M:      Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 M:      Jason Cooper <jason@lakedaemon.net>
@@ -11204,8 +11204,14 @@ F:	tools/pci/
 
 PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
 M:      Russell Currey <ruscur@russell.cc>
+M:      Sam Bobroff <sbobroff@linux.ibm.com>
+M:      Oliver O'Halloran <oohall@gmail.com>
 L:      linuxppc-dev@lists.ozlabs.org
 S:      Supported
+F:      Documentation/PCI/pci-error-recovery.txt
+F:      drivers/pci/pcie/aer.c
+F:      drivers/pci/pcie/dpc.c
+F:      drivers/pci/pcie/err.c
 F:      Documentation/powerpc/eeh-pci-error-recovery.txt
 F:      arch/powerpc/kernel/eeh*.c
 F:      arch/powerpc/platforms/*/eeh*.c
@@ -15389,7 +15395,7 @@ S:	Maintained
 UVESAFB DRIVER
 M:      Michal Januszewski <spock@gentoo.org>
 L:      linux-fbdev@vger.kernel.org
-W:      http://dev.gentoo.org/~spock/projects/uvesafb/
+W:      https://github.com/mjanusz/v86d
 S:      Maintained
 F:      Documentation/fb/uvesafb.txt
 F:      drivers/video/fbdev/uvesafb.*
diff --git a/Makefile b/Makefile
index 0c90c4354979..6c3da3e10f07 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 4
 PATCHLEVEL = 19
 SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
 NAME = Merciless Moray
 
 # *DOCUMENTATION*
diff --git a/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts b/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
index b10dccd0958f..3b1baa8605a7 100644
--- a/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
@@ -11,6 +11,7 @@
 #include "sama5d2-pinfunc.h"
 #include <dt-bindings/mfd/atmel-flexcom.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/at91.h>
 
 / {
         model = "Atmel SAMA5D2 PTC EK";
@@ -299,6 +300,7 @@
                                                          <PIN_PA30__NWE_NANDWE>,
                                                          <PIN_PB2__NRD_NANDOE>;
                                                 bias-pull-up;
+                                                atmel,drive-strength = <ATMEL_PIO_DRVSTR_ME>;
                                         };
 
                                         ale_cle_rdy_cs {
diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi
index 43ee992ccdcf..6df61518776f 100644
--- a/arch/arm/boot/dts/bcm63138.dtsi
+++ b/arch/arm/boot/dts/bcm63138.dtsi
@@ -106,21 +106,23 @@
                 global_timer: timer@1e200 {
                         compatible = "arm,cortex-a9-global-timer";
                         reg = <0x1e200 0x20>;
-                        interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;
                         clocks = <&axi_clk>;
                 };
 
                 local_timer: local-timer@1e600 {
                         compatible = "arm,cortex-a9-twd-timer";
                         reg = <0x1e600 0x20>;
-                        interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
+                                                  IRQ_TYPE_EDGE_RISING)>;
                         clocks = <&axi_clk>;
                 };
 
                 twd_watchdog: watchdog@1e620 {
                         compatible = "arm,cortex-a9-twd-wdt";
                         reg = <0x1e620 0x20>;
-                        interrupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) |
+                                                  IRQ_TYPE_LEVEL_HIGH)>;
                 };
 
                 armpll: armpll {
@@ -158,7 +160,7 @@
                 serial0: serial@600 {
                         compatible = "brcm,bcm6345-uart";
                         reg = <0x600 0x1b>;
-                        interrupts = <GIC_SPI 32 0>;
+                        interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
                         clocks = <&periph_clk>;
                         clock-names = "periph";
                         status = "disabled";
@@ -167,7 +169,7 @@
                 serial1: serial@620 {
                         compatible = "brcm,bcm6345-uart";
                         reg = <0x620 0x1b>;
-                        interrupts = <GIC_SPI 33 0>;
+                        interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
                         clocks = <&periph_clk>;
                         clock-names = "periph";
                         status = "disabled";
@@ -180,7 +182,7 @@
                         reg = <0x2000 0x600>, <0xf0 0x10>;
                         reg-names = "nand", "nand-int-base";
                         status = "disabled";
-                        interrupts = <GIC_SPI 38 0>;
+                        interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
                         interrupt-names = "nand";
                 };
 
diff --git a/arch/arm/boot/dts/stm32mp157c.dtsi b/arch/arm/boot/dts/stm32mp157c.dtsi
index 661be948ab74..185541a5b69f 100644
--- a/arch/arm/boot/dts/stm32mp157c.dtsi
+++ b/arch/arm/boot/dts/stm32mp157c.dtsi
@@ -1078,8 +1078,8 @@
                         interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
                         clocks = <&rcc SPI6_K>;
                         resets = <&rcc SPI6_R>;
-                        dmas = <&mdma1 34 0x0 0x40008 0x0 0x0 0>,
-                               <&mdma1 35 0x0 0x40002 0x0 0x0 0>;
+                        dmas = <&mdma1 34 0x0 0x40008 0x0 0x0>,
+                               <&mdma1 35 0x0 0x40002 0x0 0x0>;
                         dma-names = "rx", "tx";
                         status = "disabled";
                 };
diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi
index ffd9f00f74a4..5f547c161baf 100644
--- a/arch/arm/boot/dts/sun8i-r40.dtsi
+++ b/arch/arm/boot/dts/sun8i-r40.dtsi
@@ -800,8 +800,7 @@
                 };
 
                 hdmi_phy: hdmi-phy@1ef0000 {
-                        compatible = "allwinner,sun8i-r40-hdmi-phy",
-                                     "allwinner,sun50i-a64-hdmi-phy";
+                        compatible = "allwinner,sun8i-r40-hdmi-phy";
                         reg = <0x01ef0000 0x10000>;
                         clocks = <&ccu CLK_BUS_HDMI1>, <&ccu CLK_HDMI_SLOW>,
                                  <&ccu 7>, <&ccu 16>;
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index 07256b08226c..a6c9fbaeaefc 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -57,6 +57,45 @@ static u64 core_reg_offset_from_id(u64 id)
         return id & ~(KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK | KVM_REG_ARM_CORE);
 }
 
+static int validate_core_offset(const struct kvm_one_reg *reg)
+{
+        u64 off = core_reg_offset_from_id(reg->id);
+        int size;
+
+        switch (off) {
+        case KVM_REG_ARM_CORE_REG(regs.regs[0]) ...
+             KVM_REG_ARM_CORE_REG(regs.regs[30]):
+        case KVM_REG_ARM_CORE_REG(regs.sp):
+        case KVM_REG_ARM_CORE_REG(regs.pc):
+        case KVM_REG_ARM_CORE_REG(regs.pstate):
+        case KVM_REG_ARM_CORE_REG(sp_el1):
+        case KVM_REG_ARM_CORE_REG(elr_el1):
+        case KVM_REG_ARM_CORE_REG(spsr[0]) ...
+             KVM_REG_ARM_CORE_REG(spsr[KVM_NR_SPSR - 1]):
+                size = sizeof(__u64);
+                break;
+
+        case KVM_REG_ARM_CORE_REG(fp_regs.vregs[0]) ...
+             KVM_REG_ARM_CORE_REG(fp_regs.vregs[31]):
+                size = sizeof(__uint128_t);
+                break;
+
+        case KVM_REG_ARM_CORE_REG(fp_regs.fpsr):
+        case KVM_REG_ARM_CORE_REG(fp_regs.fpcr):
+                size = sizeof(__u32);
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        if (KVM_REG_SIZE(reg->id) == size &&
+            IS_ALIGNED(off, size / sizeof(__u32)))
+                return 0;
+
+        return -EINVAL;
+}
+
 static int get_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
 {
         /*
@@ -76,6 +115,9 @@ static int get_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
             (off + (KVM_REG_SIZE(reg->id) / sizeof(__u32))) >= nr_regs)
                 return -ENOENT;
 
+        if (validate_core_offset(reg))
+                return -EINVAL;
+
         if (copy_to_user(uaddr, ((u32 *)regs) + off, KVM_REG_SIZE(reg->id)))
                 return -EFAULT;
 
@@ -98,6 +140,9 @@ static int set_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
             (off + (KVM_REG_SIZE(reg->id) / sizeof(__u32))) >= nr_regs)
                 return -ENOENT;
 
+        if (validate_core_offset(reg))
+                return -EINVAL;
+
         if (KVM_REG_SIZE(reg->id) > sizeof(tmp))
                 return -EINVAL;
 
@@ -107,17 +152,25 @@ static int set_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
         }
 
         if (off == KVM_REG_ARM_CORE_REG(regs.pstate)) {
-                u32 mode = (*(u32 *)valp) & PSR_AA32_MODE_MASK;
+                u64 mode = (*(u64 *)valp) & PSR_AA32_MODE_MASK;
                 switch (mode) {
                 case PSR_AA32_MODE_USR:
+                        if (!system_supports_32bit_el0())
+                                return -EINVAL;
+                        break;
                 case PSR_AA32_MODE_FIQ:
                 case PSR_AA32_MODE_IRQ:
                 case PSR_AA32_MODE_SVC:
                 case PSR_AA32_MODE_ABT:
                 case PSR_AA32_MODE_UND:
+                        if (!vcpu_el1_is_32bit(vcpu))
+                                return -EINVAL;
+                        break;
                 case PSR_MODE_EL0t:
                 case PSR_MODE_EL1t:
                 case PSR_MODE_EL1h:
+                        if (vcpu_el1_is_32bit(vcpu))
+                                return -EINVAL;
                         break;
                 default:
                         err = -EINVAL;
diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
index 192b3ba07075..f58ea503ad01 100644
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@ -117,11 +117,14 @@ static pte_t get_clear_flush(struct mm_struct *mm,
 
                 /*
                  * If HW_AFDBM is enabled, then the HW could turn on
-                 * the dirty bit for any page in the set, so check
-                 * them all.  All hugetlb entries are already young.
+                 * the dirty or accessed bit for any page in the set,
+                 * so check them all.
                  */
                 if (pte_dirty(pte))
                         orig_pte = pte_mkdirty(orig_pte);
+
+                if (pte_young(pte))
+                        orig_pte = pte_mkyoung(orig_pte);
         }
 
         if (valid) {
@@ -320,11 +323,40 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
         return get_clear_flush(mm, addr, ptep, pgsize, ncontig);
 }
 
+/*
+ * huge_ptep_set_access_flags will update access flags (dirty, accesssed)
+ * and write permission.
+ *
+ * For a contiguous huge pte range we need to check whether or not write
+ * permission has to change only on the first pte in the set. Then for
+ * all the contiguous ptes we need to check whether or not there is a
+ * discrepancy between dirty or young.
+ */
+static int __cont_access_flags_changed(pte_t *ptep, pte_t pte, int ncontig)
+{
+        int i;
+
+        if (pte_write(pte) != pte_write(huge_ptep_get(ptep)))
+                return 1;
+
+        for (i = 0; i < ncontig; i++) {
+                pte_t orig_pte = huge_ptep_get(ptep + i);
+
+                if (pte_dirty(pte) != pte_dirty(orig_pte))
+                        return 1;
+
+                if (pte_young(pte) != pte_young(orig_pte))
+                        return 1;
+        }
+
+        return 0;
+}
+
 int huge_ptep_set_access_flags(struct vm_area_struct *vma,
                                unsigned long addr, pte_t *ptep,
                                pte_t pte, int dirty)
 {
-        int ncontig, i, changed = 0;
+        int ncontig, i;
         size_t pgsize = 0;
         unsigned long pfn = pte_pfn(pte), dpfn;
         pgprot_t hugeprot;
@@ -336,19 +368,23 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma,
         ncontig = find_num_contig(vma->vm_mm, addr, ptep, &pgsize);
         dpfn = pgsize >> PAGE_SHIFT;
 
+        if (!__cont_access_flags_changed(ptep, pte, ncontig))
+                return 0;
+
         orig_pte = get_clear_flush(vma->vm_mm, addr, ptep, pgsize, ncontig);
-        if (!pte_same(orig_pte, pte))
-                changed = 1;
 
-        /* Make sure we don't lose the dirty state */
+        /* Make sure we don't lose the dirty or young state */
         if (pte_dirty(orig_pte))
                 pte = pte_mkdirty(pte);
 
+        if (pte_young(orig_pte))
+                pte = pte_mkyoung(pte);
+
         hugeprot = pte_pgprot(pte);
         for (i = 0; i < ncontig; i++, ptep++, addr += pgsize, pfn += dpfn)
                 set_pte_at(vma->vm_mm, addr, ptep, pfn_pte(pfn, hugeprot));
 
-        return changed;
+        return 1;
 }
 
 void huge_ptep_set_wrprotect(struct mm_struct *mm,
diff --git a/arch/powerpc/include/asm/setup.h b/arch/powerpc/include/asm/setup.h
index 1a951b00465d..1fffbba8d6a5 100644
--- a/arch/powerpc/include/asm/setup.h
+++ b/arch/powerpc/include/asm/setup.h
@@ -9,6 +9,7 @@ extern void ppc_printk_progress(char *s, unsigned short hex);
 
 extern unsigned int rtas_data;
 extern unsigned long long memory_limit;
+extern bool init_mem_is_free;
 extern unsigned long klimit;
 extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
 
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index ea04dfb8c092..2d8fc8c9da7a 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -1314,9 +1314,7 @@ EXC_REAL_BEGIN(denorm_exception_hv, 0x1500, 0x100)
 
 #ifdef CONFIG_PPC_DENORMALISATION
         mfspr   r10,SPRN_HSRR1
-        mfspr   r11,SPRN_HSRR0          /* save HSRR0 */
         andis.  r10,r10,(HSRR1_DENORM)@h /* denorm? */
-        addi    r11,r11,-4              /* HSRR0 is next instruction */
         bne+    denorm_assist
 #endif
 
@@ -1382,6 +1380,8 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S)
  */
         XVCPSGNDP32(32)
 denorm_done:
+        mfspr   r11,SPRN_HSRR0
+        subi    r11,r11,4
         mtspr   SPRN_HSRR0,r11
         mtcrf   0x80,r9
         ld      r9,PACA_EXGEN+EX_R9(r13)
diff --git a/arch/powerpc/kernel/tm.S b/arch/powerpc/kernel/tm.S
index 6bffbc5affe7..7716374786bd 100644
--- a/arch/powerpc/kernel/tm.S
+++ b/arch/powerpc/kernel/tm.S
@@ -176,13 +176,27 @@ _GLOBAL(tm_reclaim)
         std     r1, PACATMSCRATCH(r13)
         ld      r1, PACAR1(r13)
 
-        /* Store the PPR in r11 and reset to decent value */
         std     r11, GPR11(r1)                  /* Temporary stash */
 
+        /*
+         * Move the saved user r1 to the kernel stack in case PACATMSCRATCH is
+         * clobbered by an exception once we turn on MSR_RI below.
+         */
+        ld      r11, PACATMSCRATCH(r13)
+        std     r11, GPR1(r1)
+
+        /*
+         * Store r13 away so we can free up the scratch SPR for the SLB fault
+         * handler (needed once we start accessing the thread_struct).
+         */
+        GET_SCRATCH0(r11)
+        std     r11, GPR13(r1)
+
         /* Reset MSR RI so we can take SLB faults again */
         li      r11, MSR_RI
         mtmsrd  r11, 1
 
+        /* Store the PPR in r11 and reset to decent value */
         mfspr   r11, SPRN_PPR
         HMT_MEDIUM
 
@@ -207,11 +221,11 @@ _GLOBAL(tm_reclaim)
         SAVE_GPR(8, r7)                         /* user r8 */
         SAVE_GPR(9, r7)                         /* user r9 */
         SAVE_GPR(10, r7)                        /* user r10 */
-        ld      r3, PACATMSCRATCH(r13)          /* user r1 */
+        ld      r3, GPR1(r1)                    /* user r1 */
         ld      r4, GPR7(r1)                    /* user r7 */
         ld      r5, GPR11(r1)                   /* user r11 */
         ld      r6, GPR12(r1)                   /* user r12 */
-        GET_SCRATCH0(8)                         /* user r13 */
+        ld      r8, GPR13(r1)                   /* user r13 */
         std     r3, GPR1(r7)
         std     r4, GPR7(r7)
         std     r5, GPR11(r7)
diff --git a/arch/powerpc/lib/checksum_64.S b/arch/powerpc/lib/checksum_64.S
index 886ed94b9c13..d05c8af4ac51 100644
--- a/arch/powerpc/lib/checksum_64.S
+++ b/arch/powerpc/lib/checksum_64.S
@@ -443,6 +443,9 @@ _GLOBAL(csum_ipv6_magic)
         addc    r0, r8, r9
         ld      r10, 0(r4)
         ld      r11, 8(r4)
+#ifdef CONFIG_CPU_LITTLE_ENDIAN
+        rotldi  r5, r5, 8
+#endif
         adde    r0, r0, r10
         add     r5, r5, r7
         adde    r0, r0, r11
diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c
index 850f3b8f4da5..6ae2777c220d 100644
--- a/arch/powerpc/lib/code-patching.c
+++ b/arch/powerpc/lib/code-patching.c
@@ -28,6 +28,12 @@ static int __patch_instruction(unsigned int *exec_addr, unsigned int instr,
 {
         int err;
 
+        /* Make sure we aren't patching a freed init section */
+        if (init_mem_is_free && init_section_contains(exec_addr, 4)) {
+                pr_debug("Skipping init section patching addr: 0x%px\n", exec_addr);
+                return 0;
+        }
+
         __put_user_size(instr, patch_addr, 4, err);
         if (err)
                 return err;
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 5c8530d0c611..04ccb274a620 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -63,6 +63,7 @@
 #endif
 
 unsigned long long memory_limit;
+bool init_mem_is_free;
 
 #ifdef CONFIG_HIGHMEM
 pte_t *kmap_pte;
@@ -396,6 +397,7 @@ void free_initmem(void)
 {
         ppc_md.progress = ppc_printk_progress;
         mark_initmem_nx();
+        init_mem_is_free = true;
         free_initmem_default(POISON_FREE_INITMEM);
 }
 
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 35ac5422903a..59d07bd5374a 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1204,7 +1204,9 @@ int find_and_online_cpu_nid(int cpu)
         int new_nid;
 
         /* Use associativity from first thread for all siblings */
-        vphn_get_associativity(cpu, associativity);
+        if (vphn_get_associativity(cpu, associativity))
+                return cpu_to_node(cpu);
+
         new_nid = associativity_to_nid(associativity);
         if (new_nid < 0 || !node_possible(new_nid))
                 new_nid = first_online_node;
@@ -1452,7 +1454,8 @@ static struct timer_list topology_timer;
 
 static void reset_topology_timer(void)
 {
-        mod_timer(&topology_timer, jiffies + topology_timer_secs * HZ);
+        if (vphn_enabled)
+                mod_timer(&topology_timer, jiffies + topology_timer_secs * HZ);
 }
 
 #ifdef CONFIG_SMP
diff --git a/arch/powerpc/mm/pkeys.c b/arch/powerpc/mm/pkeys.c
index 333b1f80c435..b271b283c785 100644
--- a/arch/powerpc/mm/pkeys.c
+++ b/arch/powerpc/mm/pkeys.c
@@ -45,7 +45,7 @@ static void scan_pkey_feature(void)
          * Since any pkey can be used for data or execute, we will just treat
          * all keys as equal and track them as one entity.
          */
-        pkeys_total = be32_to_cpu(vals[0]);
+        pkeys_total = vals[0];
         pkeys_devtree_defined = true;
 }
 
diff --git a/arch/powerpc/platforms/powernv/pci-ioda-tce.c b/arch/powerpc/platforms/powernv/pci-ioda-tce.c
index 6c5db1acbe8d..fe9691040f54 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda-tce.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda-tce.c
@@ -276,7 +276,7 @@ long pnv_pci_ioda2_table_alloc_pages(int nid, __u64 bus_offset,
         level_shift = entries_shift + 3;
         level_shift = max_t(unsigned int, level_shift, PAGE_SHIFT);
 
-        if ((level_shift - 3) * levels + page_shift >= 60)
+        if ((level_shift - 3) * levels + page_shift >= 55)
                 return -EINVAL;
 
         /* Allocate TCE table */
diff --git a/arch/riscv/include/asm/asm-prototypes.h b/arch/riscv/include/asm/asm-prototypes.h
new file mode 100644
index 000000000000..c9fecd120d18
--- /dev/null
+++ b/arch/riscv/include/asm/asm-prototypes.h
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_RISCV_PROTOTYPES_H
+
+#include <linux/ftrace.h>
+#include <asm-generic/asm-prototypes.h>
+
+#endif /* _ASM_RISCV_PROTOTYPES_H */
diff --git a/arch/x86/boot/compressed/mem_encrypt.S b/arch/x86/boot/compressed/mem_encrypt.S
index eaa843a52907..a480356e0ed8 100644
--- a/arch/x86/boot/compressed/mem_encrypt.S
+++ b/arch/x86/boot/compressed/mem_encrypt.S
@@ -25,20 +25,6 @@ ENTRY(get_sev_encryption_bit)
         push    %ebx
         push    %ecx
         push    %edx
-        push    %edi
-
-        /*
-         * RIP-relative addressing is needed to access the encryption bit
-         * variable. Since we are running in 32-bit mode we need this call/pop
-         * sequence to get the proper relative addressing.
-         */
-        call    1f
-1:      popl    %edi
-        subl    $1b, %edi
-
-        movl    enc_bit(%edi), %eax
-        cmpl    $0, %eax
-        jge     .Lsev_exit
 
         /* Check if running under a hypervisor */
         movl    $1, %eax
@@ -69,15 +55,12 @@ ENTRY(get_sev_encryption_bit)
 
         movl    %ebx, %eax
         andl    $0x3f, %eax             /* Return the encryption bit location */
-        movl    %eax, enc_bit(%edi)
         jmp     .Lsev_exit
 
 .Lno_sev:
         xor     %eax, %eax
-        movl    %eax, enc_bit(%edi)
 
 .Lsev_exit:
-        pop     %edi
         pop     %edx
         pop     %ecx
         pop     %ebx
@@ -113,8 +96,6 @@ ENTRY(set_sev_encryption_mask)
 ENDPROC(set_sev_encryption_mask)
 
         .data
-enc_bit:
-        .int    0xffffffff
 
 #ifdef CONFIG_AMD_MEM_ENCRYPT
         .balign 8
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index 94e1ed667b6e..41317c50a446 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -322,16 +322,11 @@ void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn,
 
         /*
          * __blk_mq_update_nr_hw_queues will update the nr_hw_queues and
-         * queue_hw_ctx after freeze the queue. So we could use q_usage_counter
-         * to avoid race with it. __blk_mq_update_nr_hw_queues will users
-         * synchronize_rcu to ensure all of the users go out of the critical
-         * section below and see zeroed q_usage_counter.
+         * queue_hw_ctx after freeze the queue, so we use q_usage_counter
+         * to avoid race with it.
          */
-        rcu_read_lock();
-        if (percpu_ref_is_zero(&q->q_usage_counter)) {
-                rcu_read_unlock();
+        if (!percpu_ref_tryget(&q->q_usage_counter))
                 return;
-        }
 
         queue_for_each_hw_ctx(q, hctx, i) {
                 struct blk_mq_tags *tags = hctx->tags;
@@ -347,7 +342,7 @@ void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn,
                         bt_for_each(hctx, &tags->breserved_tags, fn, priv, true);
                 bt_for_each(hctx, &tags->bitmap_tags, fn, priv, false);
         }
-        rcu_read_unlock();
+        blk_queue_exit(q);
 }
 
 static int bt_alloc(struct sbitmap_queue *bt, unsigned int depth,
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 85a1c1a59c72..e3c39ea8e17b 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1628,7 +1628,7 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule)
                 BUG_ON(!rq->q);
                 if (rq->mq_ctx != this_ctx) {
                         if (this_ctx) {
-                                trace_block_unplug(this_q, depth, from_schedule);
+                                trace_block_unplug(this_q, depth, !from_schedule);
                                 blk_mq_sched_insert_requests(this_q, this_ctx,
                                                                 &ctx_list,
                                                                 from_schedule);
@@ -1648,7 +1648,7 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule)
          * on 'ctx_list'. Do those.
          */
         if (this_ctx) {
-                trace_block_unplug(this_q, depth, from_schedule);
+                trace_block_unplug(this_q, depth, !from_schedule);
                 blk_mq_sched_insert_requests(this_q, this_ctx, &ctx_list,
                                                 from_schedule);
         }
diff --git a/block/elevator.c b/block/elevator.c
index 6a06b5d040e5..fae58b2f906f 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -609,7 +609,7 @@ void elv_drain_elevator(struct request_queue *q)
 
         while (e->type->ops.sq.elevator_dispatch_fn(q, 1))
                 ;
-        if (q->nr_sorted && printed++ < 10) {
+        if (q->nr_sorted && !blk_queue_is_zoned(q) && printed++ < 10 ) {
                 printk(KERN_ERR "%s: forced dispatching is broken "
                        "(nr_sorted=%u), please report this\n",
                        q->elevator->type->elevator_name, q->nr_sorted);
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index a71d817e900d..429d20131c7e 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -2670,8 +2670,8 @@ static void purge_persistent_grants(struct blkfront_info *info)
                         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);
+                        gnt_list_entry->gref = GRANT_INVALID_REF;
+                        list_add_tail(&gnt_list_entry->node, &rinfo->grants);
                 }
 
                 spin_unlock_irqrestore(&rinfo->ring_lock, flags);
diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
index ec8a4376f74f..2fab18fae4fc 100644
--- a/drivers/clocksource/timer-atmel-pit.c
+++ b/drivers/clocksource/timer-atmel-pit.c
@@ -180,26 +180,29 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
         data->base = of_iomap(node, 0);
         if (!data->base) {
                 pr_err("Could not map PIT address\n");
-                return -ENXIO;
+                ret = -ENXIO;
+                goto exit;
         }
 
         data->mck = of_clk_get(node, 0);
         if (IS_ERR(data->mck)) {
                 pr_err("Unable to get mck clk\n");
-                return PTR_ERR(data->mck);
+                ret = PTR_ERR(data->mck);
+                goto exit;
         }
 
         ret = clk_prepare_enable(data->mck);
         if (ret) {
                 pr_err("Unable to enable mck\n");
-                return ret;
+                goto exit;
         }
 
         /* Get the interrupts property */
         data->irq = irq_of_parse_and_map(node, 0);
         if (!data->irq) {
                 pr_err("Unable to get IRQ from DT\n");
-                return -EINVAL;
+                ret = -EINVAL;
+                goto exit;
         }
 
         /*
@@ -227,7 +230,7 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
         ret = clocksource_register_hz(&data->clksrc, pit_rate);
         if (ret) {
                 pr_err("Failed to register clocksource\n");
-                return ret;
+                goto exit;
         }
 
         /* Set up irq handler */
@@ -236,7 +239,8 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
                           "at91_tick", data);
         if (ret) {
                 pr_err("Unable to setup IRQ\n");
-                return ret;
+                clocksource_unregister(&data->clksrc);
+                goto exit;
         }
 
         /* Set up and register clockevents */
@@ -254,6 +258,10 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
         clockevents_register_device(&data->clkevt);
 
         return 0;
+
+exit:
+        kfree(data);
+        return ret;
 }
 TIMER_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit",
                        at91sam926x_pit_dt_init);
diff --git a/drivers/clocksource/timer-fttmr010.c b/drivers/clocksource/timer-fttmr010.c
index c020038ebfab..cf93f6419b51 100644
--- a/drivers/clocksource/timer-fttmr010.c
+++ b/drivers/clocksource/timer-fttmr010.c
@@ -130,13 +130,17 @@ static int fttmr010_timer_set_next_event(unsigned long cycles,
         cr &= ~fttmr010->t1_enable_val;
         writel(cr, fttmr010->base + TIMER_CR);
 
-        /* Setup the match register forward/backward in time */
-        cr = readl(fttmr010->base + TIMER1_COUNT);
-        if (fttmr010->count_down)
-                cr -= cycles;
-        else
-                cr += cycles;
-        writel(cr, fttmr010->base + TIMER1_MATCH1);
+        if (fttmr010->count_down) {
+                /*
+                 * ASPEED Timer Controller will load TIMER1_LOAD register
+                 * into TIMER1_COUNT register when the timer is re-enabled.
+                 */
+                writel(cycles, fttmr010->base + TIMER1_LOAD);
+        } else {
+                /* Setup the match register forward in time */
+                cr = readl(fttmr010->base + TIMER1_COUNT);
+                writel(cr + cycles, fttmr010->base + TIMER1_MATCH1);
+        }
 
         /* Start */
         cr = readl(fttmr010->base + TIMER_CR);
diff --git a/drivers/clocksource/timer-ti-32k.c b/drivers/clocksource/timer-ti-32k.c
index 29e2e1a78a43..6949a9113dbb 100644
--- a/drivers/clocksource/timer-ti-32k.c
+++ b/drivers/clocksource/timer-ti-32k.c
@@ -97,6 +97,9 @@ static int __init ti_32k_timer_init(struct device_node *np)
                 return -ENXIO;
         }
 
+        if (!of_machine_is_compatible("ti,am43"))
+                ti_32k_timer.cs.flags |= CLOCK_SOURCE_SUSPEND_NONSTOP;
+
         ti_32k_timer.counter = ti_32k_timer.base;
 
         /*
diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c
index a1830fa25fc5..2a3675c24032 100644
--- a/drivers/cpufreq/qcom-cpufreq-kryo.c
+++ b/drivers/cpufreq/qcom-cpufreq-kryo.c
@@ -44,7 +44,7 @@ enum _msm8996_version {
 
 struct platform_device *cpufreq_dt_pdev, *kryo_cpufreq_pdev;
 
-static enum _msm8996_version __init qcom_cpufreq_kryo_get_msm_id(void)
+static enum _msm8996_version qcom_cpufreq_kryo_get_msm_id(void)
 {
         size_t len;
         u32 *msm_id;
@@ -222,7 +222,7 @@ static int __init qcom_cpufreq_kryo_init(void)
 }
 module_init(qcom_cpufreq_kryo_init);
 
-static void __init qcom_cpufreq_kryo_exit(void)
+static void __exit qcom_cpufreq_kryo_exit(void)
 {
         platform_device_unregister(kryo_cpufreq_pdev);
         platform_driver_unregister(&qcom_cpufreq_kryo_driver);
diff --git a/drivers/dax/device.c b/drivers/dax/device.c
index bbe4d72ca105..948806e57cee 100644
--- a/drivers/dax/device.c
+++ b/drivers/dax/device.c
@@ -535,6 +535,11 @@ static unsigned long dax_get_unmapped_area(struct file *filp,
         return current->mm->get_unmapped_area(filp, addr, len, pgoff, flags);
 }
 
+static const struct address_space_operations dev_dax_aops = {
+        .set_page_dirty         = noop_set_page_dirty,
+        .invalidatepage         = noop_invalidatepage,
+};
+
 static int dax_open(struct inode *inode, struct file *filp)
 {
         struct dax_device *dax_dev = inode_dax(inode);
@@ -544,6 +549,7 @@ static int dax_open(struct inode *inode, struct file *filp)
         dev_dbg(&dev_dax->dev, "trace\n");
         inode->i_mapping = __dax_inode->i_mapping;
         inode->i_mapping->host = __dax_inode;
+        inode->i_mapping->a_ops = &dev_dax_aops;
         filp->f_mapping = inode->i_mapping;
         filp->f_wb_err = filemap_sample_wb_err(filp->f_mapping);
         filp->private_data = dev_dax;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 0cc5190f4f36..5f3f54073818 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -258,6 +258,8 @@ int amdgpu_vce_suspend(struct amdgpu_device *adev)
 {
         int i;
 
+        cancel_delayed_work_sync(&adev->vce.idle_work);
+
         if (adev->vce.vcpu_bo == NULL)
                 return 0;
 
@@ -268,7 +270,6 @@ int amdgpu_vce_suspend(struct amdgpu_device *adev)
         if (i == AMDGPU_MAX_VCE_HANDLES)
                 return 0;
 
-        cancel_delayed_work_sync(&adev->vce.idle_work);
         /* TODO: suspending running encoding sessions isn't supported */
         return -EINVAL;
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index fd654a4406db..400fc74bbae2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -153,11 +153,11 @@ int amdgpu_vcn_suspend(struct amdgpu_device *adev)
         unsigned size;
         void *ptr;
 
+        cancel_delayed_work_sync(&adev->vcn.idle_work);
+
         if (adev->vcn.vcpu_bo == NULL)
                 return 0;
 
-        cancel_delayed_work_sync(&adev->vcn.idle_work);
-
         size = amdgpu_bo_size(adev->vcn.vcpu_bo);
         ptr = adev->vcn.cpu_addr;
 
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 800f481a6995..96875950845a 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -641,6 +641,87 @@ amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_state *state,
         return NULL;
 }
 
+static void emulated_link_detect(struct dc_link *link)
+{
+        struct dc_sink_init_data sink_init_data = { 0 };
+        struct display_sink_capability sink_caps = { 0 };
+        enum dc_edid_status edid_status;
+        struct dc_context *dc_ctx = link->ctx;
+        struct dc_sink *sink = NULL;
+        struct dc_sink *prev_sink = NULL;
+
+        link->type = dc_connection_none;
+        prev_sink = link->local_sink;
+
+        if (prev_sink != NULL)
+                dc_sink_retain(prev_sink);
+
+        switch (link->connector_signal) {
+        case SIGNAL_TYPE_HDMI_TYPE_A: {
+                sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C;
+                sink_caps.signal = SIGNAL_TYPE_HDMI_TYPE_A;
+                break;
+        }
+
+        case SIGNAL_TYPE_DVI_SINGLE_LINK: {
+                sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C;
+                sink_caps.signal = SIGNAL_TYPE_DVI_SINGLE_LINK;
+                break;
+        }
+
+        case SIGNAL_TYPE_DVI_DUAL_LINK: {
+                sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C;
+                sink_caps.signal = SIGNAL_TYPE_DVI_DUAL_LINK;
+                break;
+        }
+
+        case SIGNAL_TYPE_LVDS: {
+                sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C;
+                sink_caps.signal = SIGNAL_TYPE_LVDS;
+                break;
+        }
+
+        case SIGNAL_TYPE_EDP: {
+                sink_caps.transaction_type =
+                        DDC_TRANSACTION_TYPE_I2C_OVER_AUX;
+                sink_caps.signal = SIGNAL_TYPE_EDP;
+                break;
+        }
+
+        case SIGNAL_TYPE_DISPLAY_PORT: {
+                sink_caps.transaction_type =
+                        DDC_TRANSACTION_TYPE_I2C_OVER_AUX;
+                sink_caps.signal = SIGNAL_TYPE_VIRTUAL;
+                break;
+        }
+
+        default:
+                DC_ERROR("Invalid connector type! signal:%d\n",
+                        link->connector_signal);
+                return;
+        }
+
+        sink_init_data.link = link;
+        sink_init_data.sink_signal = sink_caps.signal;
+
+        sink = dc_sink_create(&sink_init_data);
+        if (!sink) {
+                DC_ERROR("Failed to create sink!\n");
+                return;
+        }
+
+        link->local_sink = sink;
+
+        edid_status = dm_helpers_read_local_edid(
+                        link->ctx,
+                        link,
+                        sink);
+
+        if (edid_status != EDID_OK)
+                DC_ERROR("Failed to read EDID");
+
+}
+
 static int dm_resume(void *handle)
 {
         struct amdgpu_device *adev = handle;
@@ -654,6 +735,7 @@ static int dm_resume(void *handle)
         struct drm_plane *plane;
         struct drm_plane_state *new_plane_state;
         struct dm_plane_state *dm_new_plane_state;
+        enum dc_connection_type new_connection_type = dc_connection_none;
         int ret;
         int i;
 
@@ -684,7 +766,13 @@ static int dm_resume(void *handle)
                         continue;
 
                 mutex_lock(&aconnector->hpd_lock);
-                dc_link_detect(aconnector->dc_link, DETECT_REASON_HPD);
+                if (!dc_link_detect_sink(aconnector->dc_link, &new_connection_type))
+                        DRM_ERROR("KMS: Failed to detect connector\n");
+
+                if (aconnector->base.force && new_connection_type == dc_connection_none)
+                        emulated_link_detect(aconnector->dc_link);
+                else
+                        dc_link_detect(aconnector->dc_link, DETECT_REASON_HPD);
 
                 if (aconnector->fake_enable && aconnector->dc_link->local_sink)
                         aconnector->fake_enable = false;
@@ -922,6 +1010,7 @@ static void handle_hpd_irq(void *param)
         struct amdgpu_dm_connector *aconnector = (struct amdgpu_dm_connector *)param;
         struct drm_connector *connector = &aconnector->base;
         struct drm_device *dev = connector->dev;
+        enum dc_connection_type new_connection_type = dc_connection_none;
 
         /* In case of failure or MST no need to update connector status or notify the OS
          * since (for MST case) MST does this in it's own context.
@@ -931,7 +1020,21 @@ static void handle_hpd_irq(void *param)
         if (aconnector->fake_enable)
                 aconnector->fake_enable = false;
 
-        if (dc_link_detect(aconnector->dc_link, DETECT_REASON_HPD)) {
+        if (!dc_link_detect_sink(aconnector->dc_link, &new_connection_type))
+                DRM_ERROR("KMS: Failed to detect connector\n");
+
+        if (aconnector->base.force && new_connection_type == dc_connection_none) {
+                emulated_link_detect(aconnector->dc_link);
+
+
+                drm_modeset_lock_all(dev);
+                dm_restore_drm_connector_state(dev, connector);
+                drm_modeset_unlock_all(dev);
+
+                if (aconnector->base.force == DRM_FORCE_UNSPECIFIED)
+                        drm_kms_helper_hotplug_event(dev);
+
+        } else if (dc_link_detect(aconnector->dc_link, DETECT_REASON_HPD)) {
                 amdgpu_dm_update_connector_after_detect(aconnector);
 
 
@@ -1031,6 +1134,7 @@ static void handle_hpd_rx_irq(void *param)
         struct drm_device *dev = connector->dev;
         struct dc_link *dc_link = aconnector->dc_link;
         bool is_mst_root_connector = aconnector->mst_mgr.mst_state;
+        enum dc_connection_type new_connection_type = dc_connection_none;
 
         /* TODO:Temporary add mutex to protect hpd interrupt not have a gpio
          * conflict, after implement i2c helper, this mutex should be
@@ -1042,7 +1146,24 @@ static void handle_hpd_rx_irq(void *param)
         if (dc_link_handle_hpd_rx_irq(dc_link, NULL, NULL) &&
                         !is_mst_root_connector) {
                 /* Downstream Port status changed. */
-                if (dc_link_detect(dc_link, DETECT_REASON_HPDRX)) {
+                if (!dc_link_detect_sink(dc_link, &new_connection_type))
+                        DRM_ERROR("KMS: Failed to detect connector\n");
+
+                if (aconnector->base.force && new_connection_type == dc_connection_none) {
+                        emulated_link_detect(dc_link);
+
+                        if (aconnector->fake_enable)
+                                aconnector->fake_enable = false;
+
+                        amdgpu_dm_update_connector_after_detect(aconnector);
+
+
+                        drm_modeset_lock_all(dev);
+                        dm_restore_drm_connector_state(dev, connector);
+                        drm_modeset_unlock_all(dev);
+
+                        drm_kms_helper_hotplug_event(dev);
+                } else if (dc_link_detect(dc_link, DETECT_REASON_HPDRX)) {
 
                         if (aconnector->fake_enable)
                                 aconnector->fake_enable = false;
@@ -1433,6 +1554,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
         struct amdgpu_mode_info *mode_info = &adev->mode_info;
         uint32_t link_cnt;
         int32_t total_overlay_planes, total_primary_planes;
+        enum dc_connection_type new_connection_type = dc_connection_none;
 
         link_cnt = dm->dc->caps.max_links;
         if (amdgpu_dm_mode_config_init(dm->adev)) {
@@ -1499,7 +1621,14 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
 
                 link = dc_get_link_at_index(dm->dc, i);
 
-                if (dc_link_detect(link, DETECT_REASON_BOOT)) {
+                if (!dc_link_detect_sink(link, &new_connection_type))
+                        DRM_ERROR("KMS: Failed to detect connector\n");
+
+                if (aconnector->base.force && new_connection_type == dc_connection_none) {
+                        emulated_link_detect(link);
+                        amdgpu_dm_update_connector_after_detect(aconnector);
+
+                } else if (dc_link_detect(link, DETECT_REASON_BOOT)) {
                         amdgpu_dm_update_connector_after_detect(aconnector);
                         register_backlight_device(dm, link);
                 }
@@ -2494,7 +2623,7 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
         if (dm_state && dm_state->freesync_capable)
                 stream->ignore_msa_timing_param = true;
 finish:
-        if (sink && sink->sink_signal == SIGNAL_TYPE_VIRTUAL)
+        if (sink && sink->sink_signal == SIGNAL_TYPE_VIRTUAL && aconnector->base.force != DRM_FORCE_ON)
                 dc_sink_release(sink);
 
         return stream;
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 37eaf72ace54..fced3c1c2ef5 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -195,7 +195,7 @@ static bool program_hpd_filter(
         return result;
 }
 
-static bool detect_sink(struct dc_link *link, enum dc_connection_type *type)
+bool dc_link_detect_sink(struct dc_link *link, enum dc_connection_type *type)
 {
         uint32_t is_hpd_high = 0;
         struct gpio *hpd_pin;
@@ -604,7 +604,7 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason)
         if (link->connector_signal == SIGNAL_TYPE_VIRTUAL)
                 return false;
 
-        if (false == detect_sink(link, &new_connection_type)) {
+        if (false == dc_link_detect_sink(link, &new_connection_type)) {
                 BREAK_TO_DEBUGGER();
                 return false;
         }
diff --git a/drivers/gpu/drm/amd/display/dc/dc_link.h b/drivers/gpu/drm/amd/display/dc/dc_link.h
index d43cefbc43d3..1b48ab9aea89 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_link.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_link.h
@@ -215,6 +215,7 @@ void dc_link_enable_hpd_filter(struct dc_link *link, bool enable);
 
 bool dc_link_is_dp_sink_present(struct dc_link *link);
 
+bool dc_link_detect_sink(struct dc_link *link, enum dc_connection_type *type);
 /*
  * DPCD access interfaces
  */
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index 14384d9675a8..b2f308766a9e 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -2560,7 +2560,7 @@ static void pplib_apply_display_requirements(
         dc->prev_display_config = *pp_display_cfg;
 }
 
-void dce110_set_bandwidth(
+static void dce110_set_bandwidth(
                 struct dc *dc,
                 struct dc_state *context,
                 bool decrease_allowed)
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.h b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.h
index e4c5db75c4c6..d6db3dbd9015 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.h
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.h
@@ -68,11 +68,6 @@ void dce110_fill_display_configs(
         const struct dc_state *context,
         struct dm_pp_display_configuration *pp_display_cfg);
 
-void dce110_set_bandwidth(
-                struct dc *dc,
-                struct dc_state *context,
-                bool decrease_allowed);
-
 uint32_t dce110_get_min_vblank_time_us(const struct dc_state *context);
 
 void dp_receiver_power_ctrl(struct dc_link *link, bool on);
diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_hw_sequencer.c
index 5853522a6182..eb0f5f9a973b 100644
--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_hw_sequencer.c
@@ -244,17 +244,6 @@ static void dce120_update_dchub(
         dh_data->dchub_info_valid = false;
 }
 
-static void dce120_set_bandwidth(
-                struct dc *dc,
-                struct dc_state *context,
-                bool decrease_allowed)
-{
-        if (context->stream_count <= 0)
-                return;
-
-        dce110_set_bandwidth(dc, context, decrease_allowed);
-}
-
 void dce120_hw_sequencer_construct(struct dc *dc)
 {
         /* All registers used by dce11.2 match those in dce11 in offset and
@@ -263,6 +252,5 @@ void dce120_hw_sequencer_construct(struct dc *dc)
         dce110_hw_sequencer_construct(dc);
         dc->hwss.enable_display_power_gating = dce120_enable_display_power_gating;
         dc->hwss.update_dchub = dce120_update_dchub;
-        dc->hwss.set_bandwidth = dce120_set_bandwidth;
 }
 
diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
index 08b5bb219816..94d6dabec2dc 100644
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -754,6 +754,7 @@ static int malidp_bind(struct device *dev)
         drm->irq_enabled = true;
 
         ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
+        drm_crtc_vblank_reset(&malidp->crtc);
         if (ret < 0) {
                 DRM_ERROR("failed to initialise vblank\n");
                 goto vblank_fail;
diff --git a/drivers/gpu/drm/arm/malidp_hw.c b/drivers/gpu/drm/arm/malidp_hw.c
index c94a4422e0e9..2781e462c1ed 100644
--- a/drivers/gpu/drm/arm/malidp_hw.c
+++ b/drivers/gpu/drm/arm/malidp_hw.c
@@ -384,7 +384,8 @@ static long malidp500_se_calc_mclk(struct malidp_hw_device *hwdev,
 
 static int malidp500_enable_memwrite(struct malidp_hw_device *hwdev,
                                      dma_addr_t *addrs, s32 *pitches,
-                                     int num_planes, u16 w, u16 h, u32 fmt_id)
+                                     int num_planes, u16 w, u16 h, u32 fmt_id,
+                                     const s16 *rgb2yuv_coeffs)
 {
         u32 base = MALIDP500_SE_MEMWRITE_BASE;
         u32 de_base = malidp_get_block_base(hwdev, MALIDP_DE_BLOCK);
@@ -416,6 +417,16 @@ static int malidp500_enable_memwrite(struct malidp_hw_device *hwdev,
 
         malidp_hw_write(hwdev, MALIDP_DE_H_ACTIVE(w) | MALIDP_DE_V_ACTIVE(h),
                         MALIDP500_SE_MEMWRITE_OUT_SIZE);
+
+        if (rgb2yuv_coeffs) {
+                int i;
+
+                for (i = 0; i < MALIDP_COLORADJ_NUM_COEFFS; i++) {
+                        malidp_hw_write(hwdev, rgb2yuv_coeffs[i],
+                                        MALIDP500_SE_RGB_YUV_COEFFS + i * 4);
+                }
+        }
+
         malidp_hw_setbits(hwdev, MALIDP_SE_MEMWRITE_EN, MALIDP500_SE_CONTROL);
 
         return 0;
@@ -658,7 +669,8 @@ static long malidp550_se_calc_mclk(struct malidp_hw_device *hwdev,
 
 static int malidp550_enable_memwrite(struct malidp_hw_device *hwdev,
                                      dma_addr_t *addrs, s32 *pitches,
-                                     int num_planes, u16 w, u16 h, u32 fmt_id)
+                                     int num_planes, u16 w, u16 h, u32 fmt_id,
+                                     const s16 *rgb2yuv_coeffs)
 {
         u32 base = MALIDP550_SE_MEMWRITE_BASE;
         u32 de_base = malidp_get_block_base(hwdev, MALIDP_DE_BLOCK);
@@ -689,6 +701,15 @@ static int malidp550_enable_memwrite(struct malidp_hw_device *hwdev,
         malidp_hw_setbits(hwdev, MALIDP550_SE_MEMWRITE_ONESHOT | MALIDP_SE_MEMWRITE_EN,
                           MALIDP550_SE_CONTROL);
 
+        if (rgb2yuv_coeffs) {
+                int i;
+
+                for (i = 0; i < MALIDP_COLORADJ_NUM_COEFFS; i++) {
+                        malidp_hw_write(hwdev, rgb2yuv_coeffs[i],
+                                        MALIDP550_SE_RGB_YUV_COEFFS + i * 4);
+                }
+        }
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/arm/malidp_hw.h b/drivers/gpu/drm/arm/malidp_hw.h
index ad2e96915d44..9fc94c08190f 100644
--- a/drivers/gpu/drm/arm/malidp_hw.h
+++ b/drivers/gpu/drm/arm/malidp_hw.h
@@ -191,7 +191,8 @@ struct malidp_hw {
          * @param fmt_id - internal format ID of output buffer
          */
         int (*enable_memwrite)(struct malidp_hw_device *hwdev, dma_addr_t *addrs,
-                               s32 *pitches, int num_planes, u16 w, u16 h, u32 fmt_id);
+                               s32 *pitches, int num_planes, u16 w, u16 h, u32 fmt_id,
+                               const s16 *rgb2yuv_coeffs);
 
         /*
          * Disable the writing to memory of the next frame's content.
diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c
index ba6ae66387c9..91472e5e0c8b 100644
--- a/drivers/gpu/drm/arm/malidp_mw.c
+++ b/drivers/gpu/drm/arm/malidp_mw.c
@@ -26,6 +26,8 @@ struct malidp_mw_connector_state {
         s32 pitches[2];
         u8 format;
         u8 n_planes;
+        bool rgb2yuv_initialized;
+        const s16 *rgb2yuv_coeffs;
 };
 
 static int malidp_mw_connector_get_modes(struct drm_connector *connector)
@@ -84,7 +86,7 @@ static void malidp_mw_connector_destroy(struct drm_connector *connector)
 static struct drm_connector_state *
 malidp_mw_connector_duplicate_state(struct drm_connector *connector)
 {
-        struct malidp_mw_connector_state *mw_state;
+        struct malidp_mw_connector_state *mw_state, *mw_current_state;
 
         if (WARN_ON(!connector->state))
                 return NULL;
@@ -93,7 +95,10 @@ malidp_mw_connector_duplicate_state(struct drm_connector *connector)
         if (!mw_state)
                 return NULL;
 
-        /* No need to preserve any of our driver-local data */
+        mw_current_state = to_mw_state(connector->state);
+        mw_state->rgb2yuv_coeffs = mw_current_state->rgb2yuv_coeffs;
+        mw_state->rgb2yuv_initialized = mw_current_state->rgb2yuv_initialized;
+
         __drm_atomic_helper_connector_duplicate_state(connector, &mw_state->base);
 
         return &mw_state->base;
@@ -108,6 +113,13 @@ static const struct drm_connector_funcs malidp_mw_connector_funcs = {
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
 };
 
+static const s16 rgb2yuv_coeffs_bt709_limited[MALIDP_COLORADJ_NUM_COEFFS] = {
+        47,  157,   16,
+        -26,  -87,  112,
+        112, -102,  -10,
+        16,  128,  128
+};
+
 static int
 malidp_mw_encoder_atomic_check(struct drm_encoder *encoder,
                                struct drm_crtc_state *crtc_state,
@@ -157,6 +169,9 @@ malidp_mw_encoder_atomic_check(struct drm_encoder *encoder,
         }
         mw_state->n_planes = n_planes;
 
+        if (fb->format->is_yuv)
+                mw_state->rgb2yuv_coeffs = rgb2yuv_coeffs_bt709_limited;
+
         return 0;
 }
 
@@ -239,10 +254,12 @@ void malidp_mw_atomic_commit(struct drm_device *drm,
 
                 drm_writeback_queue_job(mw_conn, conn_state->writeback_job);
                 conn_state->writeback_job = NULL;
-
                 hwdev->hw->enable_memwrite(hwdev, mw_state->addrs,
                                            mw_state->pitches, mw_state->n_planes,
-                                           fb->width, fb->height, mw_state->format);
+                                           fb->width, fb->height, mw_state->format,
+                                           !mw_state->rgb2yuv_initialized ?
+                                           mw_state->rgb2yuv_coeffs : NULL);
+                mw_state->rgb2yuv_initialized = !!mw_state->rgb2yuv_coeffs;
         } else {
                 DRM_DEV_DEBUG_DRIVER(drm->dev, "Disable memwrite\n");
                 hwdev->hw->disable_memwrite(hwdev);
diff --git a/drivers/gpu/drm/arm/malidp_regs.h b/drivers/gpu/drm/arm/malidp_regs.h
index 3579d36b2a71..6ffe849774f2 100644
--- a/drivers/gpu/drm/arm/malidp_regs.h
+++ b/drivers/gpu/drm/arm/malidp_regs.h
@@ -205,6 +205,7 @@
 #define MALIDP500_SE_BASE               0x00c00
 #define MALIDP500_SE_CONTROL            0x00c0c
 #define MALIDP500_SE_MEMWRITE_OUT_SIZE  0x00c2c
+#define MALIDP500_SE_RGB_YUV_COEFFS     0x00C74
 #define MALIDP500_SE_MEMWRITE_BASE      0x00e00
 #define MALIDP500_DC_IRQ_BASE           0x00f00
 #define MALIDP500_CONFIG_VALID          0x00f00
@@ -238,6 +239,7 @@
 #define MALIDP550_SE_CONTROL            0x08010
 #define   MALIDP550_SE_MEMWRITE_ONESHOT (1 << 7)
 #define MALIDP550_SE_MEMWRITE_OUT_SIZE  0x08030
+#define MALIDP550_SE_RGB_YUV_COEFFS     0x08078
 #define MALIDP550_SE_MEMWRITE_BASE      0x08100
 #define MALIDP550_DC_BASE               0x0c000
 #define MALIDP550_DC_CONTROL            0x0c010
diff --git a/drivers/gpu/drm/drm_panel.c b/drivers/gpu/drm/drm_panel.c
index b902361dee6e..1d9a9d2fe0e0 100644
--- a/drivers/gpu/drm/drm_panel.c
+++ b/drivers/gpu/drm/drm_panel.c
@@ -24,7 +24,6 @@
 #include <linux/err.h>
 #include <linux/module.h>
 
-#include <drm/drm_device.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_panel.h>
 
@@ -105,13 +104,6 @@ int drm_panel_attach(struct drm_panel *panel, struct drm_connector *connector)
         if (panel->connector)
                 return -EBUSY;
 
-        panel->link = device_link_add(connector->dev->dev, panel->dev, 0);
-        if (!panel->link) {
-                dev_err(panel->dev, "failed to link panel to %s\n",
-                        dev_name(connector->dev->dev));
-                return -EINVAL;
-        }
-
         panel->connector = connector;
         panel->drm = connector->dev;
 
@@ -133,8 +125,6 @@ EXPORT_SYMBOL(drm_panel_attach);
  */
 int drm_panel_detach(struct drm_panel *panel)
 {
-        device_link_del(panel->link);
-
         panel->connector = NULL;
         panel->drm = NULL;
 
diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index adb3cb27d31e..759278fef35a 100644
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -97,6 +97,8 @@ static int drm_syncobj_fence_get_or_add_callback(struct drm_syncobj *syncobj,
 {
         int ret;
 
+        WARN_ON(*fence);
+
         *fence = drm_syncobj_fence_get(syncobj);
         if (*fence)
                 return 1;
@@ -743,6 +745,9 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs,
 
         if (flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT) {
                 for (i = 0; i < count; ++i) {
+                        if (entries[i].fence)
+                                continue;
+
                         drm_syncobj_fence_get_or_add_callback(syncobjs[i],
                                                               &entries[i].fence,
                                                               &entries[i].syncobj_cb,
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index 9b2720b41571..83c1f46670bf 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -592,8 +592,6 @@ static int etnaviv_pdev_probe(struct platform_device *pdev)
         struct device *dev = &pdev->dev;
         struct component_match *match = NULL;
 
-        dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
-
         if (!dev->platform_data) {
                 struct device_node *core_node;
 
@@ -655,13 +653,30 @@ static int __init etnaviv_init(void)
         for_each_compatible_node(np, NULL, "vivante,gc") {
                 if (!of_device_is_available(np))
                         continue;
-                pdev = platform_device_register_simple("etnaviv", -1,
-                                                       NULL, 0);
-                if (IS_ERR(pdev)) {
-                        ret = PTR_ERR(pdev);
+
+                pdev = platform_device_alloc("etnaviv", -1);
+                if (!pdev) {
+                        ret = -ENOMEM;
+                        of_node_put(np);
+                        goto unregister_platform_driver;
+                }
+                pdev->dev.coherent_dma_mask = DMA_BIT_MASK(40);
+                pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
+
+                /*
+                 * Apply the same DMA configuration to the virtual etnaviv
+                 * device as the GPU we found. This assumes that all Vivante
+                 * GPUs in the system share the same DMA constraints.
+                 */
+                of_dma_configure(&pdev->dev, np, true);
+
+                ret = platform_device_add(pdev);
+                if (ret) {
+                        platform_device_put(pdev);
                         of_node_put(np);
                         goto unregister_platform_driver;
                 }
+
                 etnaviv_drm = pdev;
                 of_node_put(np);
                 break;
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 5146ee029db4..bc49909aba8e 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -976,7 +976,6 @@
 #define USB_DEVICE_ID_SIS817_TOUCH      0x0817
 #define USB_DEVICE_ID_SIS_TS            0x1013
 #define USB_DEVICE_ID_SIS1030_TOUCH     0x1030
-#define USB_DEVICE_ID_SIS10FB_TOUCH     0x10fb
 
 #define USB_VENDOR_ID_SKYCABLE                  0x1223
 #define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER       0x3F07
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index f3076659361a..4e3592e7a3f7 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -47,7 +47,7 @@
 /* quirks to control the device */
 #define I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV        BIT(0)
 #define I2C_HID_QUIRK_NO_IRQ_AFTER_RESET        BIT(1)
-#define I2C_HID_QUIRK_RESEND_REPORT_DESCR       BIT(2)
+#define I2C_HID_QUIRK_NO_RUNTIME_PM             BIT(2)
 
 /* flags */
 #define I2C_HID_STARTED         0
@@ -169,9 +169,8 @@ static const struct i2c_hid_quirks {
         { USB_VENDOR_ID_WEIDA, USB_DEVICE_ID_WEIDA_8755,
                 I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV },
         { I2C_VENDOR_ID_HANTICK, I2C_PRODUCT_ID_HANTICK_5288,
-                I2C_HID_QUIRK_NO_IRQ_AFTER_RESET },
-        { USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS10FB_TOUCH,
-                I2C_HID_QUIRK_RESEND_REPORT_DESCR },
+                I2C_HID_QUIRK_NO_IRQ_AFTER_RESET |
+                I2C_HID_QUIRK_NO_RUNTIME_PM },
         { 0, 0 }
 };
 
@@ -1105,7 +1104,9 @@ static int i2c_hid_probe(struct i2c_client *client,
                 goto err_mem_free;
         }
 
-        pm_runtime_put(&client->dev);
+        if (!(ihid->quirks & I2C_HID_QUIRK_NO_RUNTIME_PM))
+                pm_runtime_put(&client->dev);
+
         return 0;
 
 err_mem_free:
@@ -1130,7 +1131,8 @@ static int i2c_hid_remove(struct i2c_client *client)
         struct i2c_hid *ihid = i2c_get_clientdata(client);
         struct hid_device *hid;
 
-        pm_runtime_get_sync(&client->dev);
+        if (!(ihid->quirks & I2C_HID_QUIRK_NO_RUNTIME_PM))
+                pm_runtime_get_sync(&client->dev);
         pm_runtime_disable(&client->dev);
         pm_runtime_set_suspended(&client->dev);
         pm_runtime_put_noidle(&client->dev);
@@ -1236,22 +1238,13 @@ static int i2c_hid_resume(struct device *dev)
 
         /* Instead of resetting device, simply powers the device on. This
          * solves "incomplete reports" on Raydium devices 2386:3118 and
-         * 2386:4B33
+         * 2386:4B33 and fixes various SIS touchscreens no longer sending
+         * data after a suspend/resume.
          */
         ret = i2c_hid_set_power(client, I2C_HID_PWR_ON);
         if (ret)
                 return ret;
 
-        /* Some devices need to re-send report descr cmd
-         * after resume, after this it will be back normal.
-         * otherwise it issues too many incomplete reports.
-         */
-        if (ihid->quirks & I2C_HID_QUIRK_RESEND_REPORT_DESCR) {
-                ret = i2c_hid_command(client, &hid_report_descr_cmd, NULL, 0);
-                if (ret)
-                        return ret;
-        }
-
         if (hid->driver && hid->driver->reset_resume) {
                 ret = hid->driver->reset_resume(hid);
                 return ret;
diff --git a/drivers/hid/intel-ish-hid/ipc/hw-ish.h b/drivers/hid/intel-ish-hid/ipc/hw-ish.h
index da133716bed0..08a8327dfd22 100644
--- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h
+++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h
@@ -29,6 +29,7 @@
 #define CNL_Ax_DEVICE_ID        0x9DFC
 #define GLK_Ax_DEVICE_ID        0x31A2
 #define CNL_H_DEVICE_ID         0xA37C
+#define ICL_MOBILE_DEVICE_ID    0x34FC
 #define SPT_H_DEVICE_ID         0xA135
 
 #define REVISION_ID_CHT_A0      0x6
diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
index a1125a5c7965..256b3016116c 100644
--- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
+++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
@@ -38,6 +38,7 @@ static const struct pci_device_id ish_pci_tbl[] = {
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_Ax_DEVICE_ID)},
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, GLK_Ax_DEVICE_ID)},
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_DEVICE_ID)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ICL_MOBILE_DEVICE_ID)},
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, SPT_H_DEVICE_ID)},
         {0, }
 };
diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index 0bee1f4b914e..3208ad6ad540 100644
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -338,6 +338,39 @@ static int add_roce_gid(struct ib_gid_table_entry *entry)
 }
 
 /**
+ * del_gid - Delete GID table entry
+ *
+ * @ib_dev:     IB device whose GID entry to be deleted
+ * @port:       Port number of the IB device
+ * @table:      GID table of the IB device for a port
+ * @ix:         GID entry index to delete
+ *
+ */
+static void del_gid(struct ib_device *ib_dev, u8 port,
+                    struct ib_gid_table *table, int ix)
+{
+        struct ib_gid_table_entry *entry;
+
+        lockdep_assert_held(&table->lock);
+
+        pr_debug("%s device=%s port=%d index=%d gid %pI6\n", __func__,
+                 ib_dev->name, port, ix,
+                 table->data_vec[ix]->attr.gid.raw);
+
+        write_lock_irq(&table->rwlock);
+        entry = table->data_vec[ix];
+        entry->state = GID_TABLE_ENTRY_PENDING_DEL;
+        /*
+         * For non RoCE protocol, GID entry slot is ready to use.
+         */
+        if (!rdma_protocol_roce(ib_dev, port))
+                table->data_vec[ix] = NULL;
+        write_unlock_irq(&table->rwlock);
+
+        put_gid_entry_locked(entry);
+}
+
+/**
  * add_modify_gid - Add or modify GID table entry
  *
  * @table:      GID table in which GID to be added or modified
@@ -358,7 +391,7 @@ static int add_modify_gid(struct ib_gid_table *table,
          * this index.
          */
         if (is_gid_entry_valid(table->data_vec[attr->index]))
-                put_gid_entry(table->data_vec[attr->index]);
+                del_gid(attr->device, attr->port_num, table, attr->index);
 
         /*
          * Some HCA's report multiple GID entries with only one valid GID, and
@@ -386,39 +419,6 @@ done:
         return ret;
 }
 
-/**
- * del_gid - Delete GID table entry
- *
- * @ib_dev:     IB device whose GID entry to be deleted
- * @port:       Port number of the IB device
- * @table:      GID table of the IB device for a port
- * @ix:         GID entry index to delete
- *
- */
-static void del_gid(struct ib_device *ib_dev, u8 port,
-                    struct ib_gid_table *table, int ix)
-{
-        struct ib_gid_table_entry *entry;
-
-        lockdep_assert_held(&table->lock);
-
-        pr_debug("%s device=%s port=%d index=%d gid %pI6\n", __func__,
-                 ib_dev->name, port, ix,
-                 table->data_vec[ix]->attr.gid.raw);
-
-        write_lock_irq(&table->rwlock);
-        entry = table->data_vec[ix];
-        entry->state = GID_TABLE_ENTRY_PENDING_DEL;
-        /*
-         * For non RoCE protocol, GID entry slot is ready to use.
-         */
-        if (!rdma_protocol_roce(ib_dev, port))
-                table->data_vec[ix] = NULL;
-        write_unlock_irq(&table->rwlock);
-
-        put_gid_entry_locked(entry);
-}
-
 /* rwlock should be read locked, or lock should be held */
 static int find_gid(struct ib_gid_table *table, const union ib_gid *gid,
                     const struct ib_gid_attr *val, bool default_gid,
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 5f437d1570fb..21863ddde63e 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -1759,6 +1759,8 @@ static int ucma_close(struct inode *inode, struct file *filp)
                 mutex_lock(&mut);
                 if (!ctx->closing) {
                         mutex_unlock(&mut);
+                        ucma_put_ctx(ctx);
+                        wait_for_completion(&ctx->comp);
                         /* rdma_destroy_id ensures that no event handlers are
                          * inflight for that id before releasing it.
                          */
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index a21d5214afc3..e012ca80f9d1 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -2027,33 +2027,55 @@ static int modify_qp(struct ib_uverbs_file *file,
 
         if ((cmd->base.attr_mask & IB_QP_CUR_STATE &&
             cmd->base.cur_qp_state > IB_QPS_ERR) ||
-            cmd->base.qp_state > IB_QPS_ERR) {
+            (cmd->base.attr_mask & IB_QP_STATE &&
+            cmd->base.qp_state > IB_QPS_ERR)) {
                 ret = -EINVAL;
                 goto release_qp;
         }
 
-        attr->qp_state            = cmd->base.qp_state;
-        attr->cur_qp_state        = cmd->base.cur_qp_state;
-        attr->path_mtu            = cmd->base.path_mtu;
-        attr->path_mig_state      = cmd->base.path_mig_state;
-        attr->qkey                = cmd->base.qkey;
-        attr->rq_psn              = cmd->base.rq_psn;
-        attr->sq_psn              = cmd->base.sq_psn;
-        attr->dest_qp_num         = cmd->base.dest_qp_num;
-        attr->qp_access_flags     = cmd->base.qp_access_flags;
-        attr->pkey_index          = cmd->base.pkey_index;
-        attr->alt_pkey_index      = cmd->base.alt_pkey_index;
-        attr->en_sqd_async_notify = cmd->base.en_sqd_async_notify;
-        attr->max_rd_atomic       = cmd->base.max_rd_atomic;
-        attr->max_dest_rd_atomic  = cmd->base.max_dest_rd_atomic;
-        attr->min_rnr_timer       = cmd->base.min_rnr_timer;
-        attr->port_num            = cmd->base.port_num;
-        attr->timeout             = cmd->base.timeout;
-        attr->retry_cnt           = cmd->base.retry_cnt;
-        attr->rnr_retry           = cmd->base.rnr_retry;
-        attr->alt_port_num        = cmd->base.alt_port_num;
-        attr->alt_timeout         = cmd->base.alt_timeout;
-        attr->rate_limit          = cmd->rate_limit;
+        if (cmd->base.attr_mask & IB_QP_STATE)
+                attr->qp_state = cmd->base.qp_state;
+        if (cmd->base.attr_mask & IB_QP_CUR_STATE)
+                attr->cur_qp_state = cmd->base.cur_qp_state;
+        if (cmd->base.attr_mask & IB_QP_PATH_MTU)
+                attr->path_mtu = cmd->base.path_mtu;
+        if (cmd->base.attr_mask & IB_QP_PATH_MIG_STATE)
+                attr->path_mig_state = cmd->base.path_mig_state;
+        if (cmd->base.attr_mask & IB_QP_QKEY)
+                attr->qkey = cmd->base.qkey;
+        if (cmd->base.attr_mask & IB_QP_RQ_PSN)
+                attr->rq_psn = cmd->base.rq_psn;
+        if (cmd->base.attr_mask & IB_QP_SQ_PSN)
+                attr->sq_psn = cmd->base.sq_psn;
+        if (cmd->base.attr_mask & IB_QP_DEST_QPN)
+                attr->dest_qp_num = cmd->base.dest_qp_num;
+        if (cmd->base.attr_mask & IB_QP_ACCESS_FLAGS)
+                attr->qp_access_flags = cmd->base.qp_access_flags;
+        if (cmd->base.attr_mask & IB_QP_PKEY_INDEX)
+                attr->pkey_index = cmd->base.pkey_index;
+        if (cmd->base.attr_mask & IB_QP_EN_SQD_ASYNC_NOTIFY)
+                attr->en_sqd_async_notify = cmd->base.en_sqd_async_notify;
+        if (cmd->base.attr_mask & IB_QP_MAX_QP_RD_ATOMIC)
+                attr->max_rd_atomic = cmd->base.max_rd_atomic;
+        if (cmd->base.attr_mask & IB_QP_MAX_DEST_RD_ATOMIC)
+                attr->max_dest_rd_atomic = cmd->base.max_dest_rd_atomic;
+        if (cmd->base.attr_mask & IB_QP_MIN_RNR_TIMER)
+                attr->min_rnr_timer = cmd->base.min_rnr_timer;
+        if (cmd->base.attr_mask & IB_QP_PORT)
+                attr->port_num = cmd->base.port_num;
+        if (cmd->base.attr_mask & IB_QP_TIMEOUT)
+                attr->timeout = cmd->base.timeout;
+        if (cmd->base.attr_mask & IB_QP_RETRY_CNT)
+                attr->retry_cnt = cmd->base.retry_cnt;
+        if (cmd->base.attr_mask & IB_QP_RNR_RETRY)
+                attr->rnr_retry = cmd->base.rnr_retry;
+        if (cmd->base.attr_mask & IB_QP_ALT_PATH) {
+                attr->alt_port_num = cmd->base.alt_port_num;
+                attr->alt_timeout = cmd->base.alt_timeout;
+                attr->alt_pkey_index = cmd->base.alt_pkey_index;
+        }
+        if (cmd->base.attr_mask & IB_QP_RATE_LIMIT)
+                attr->rate_limit = cmd->rate_limit;
 
         if (cmd->base.attr_mask & IB_QP_AV)
                 copy_ah_attr_from_uverbs(qp->device, &attr->ah_attr,
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 6d974e2363df..50152c1b1004 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -440,6 +440,7 @@ static int ib_uverbs_comp_event_close(struct inode *inode, struct file *filp)
                         list_del(&entry->obj_list);
                 kfree(entry);
         }
+        file->ev_queue.is_closed = 1;
         spin_unlock_irq(&file->ev_queue.lock);
 
         uverbs_close_fd(filp);
diff --git a/drivers/infiniband/core/uverbs_uapi.c b/drivers/infiniband/core/uverbs_uapi.c
index 73ea6f0db88f..be854628a7c6 100644
--- a/drivers/infiniband/core/uverbs_uapi.c
+++ b/drivers/infiniband/core/uverbs_uapi.c
@@ -248,6 +248,7 @@ void uverbs_destroy_api(struct uverbs_api *uapi)
                 kfree(rcu_dereference_protected(*slot, true));
                 radix_tree_iter_delete(&uapi->radix, &iter, slot);
         }
+        kfree(uapi);
 }
 
 struct uverbs_api *uverbs_alloc_api(
diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
index 20b9f31052bf..85cd1a3593d6 100644
--- a/drivers/infiniband/hw/bnxt_re/main.c
+++ b/drivers/infiniband/hw/bnxt_re/main.c
@@ -78,7 +78,7 @@ static struct list_head bnxt_re_dev_list = LIST_HEAD_INIT(bnxt_re_dev_list);
 /* Mutex to protect the list of bnxt_re devices added */
 static DEFINE_MUTEX(bnxt_re_dev_lock);
 static struct workqueue_struct *bnxt_re_wq;
-static void bnxt_re_ib_unreg(struct bnxt_re_dev *rdev, bool lock_wait);
+static void bnxt_re_ib_unreg(struct bnxt_re_dev *rdev);
 
 /* SR-IOV helper functions */
 
@@ -182,7 +182,7 @@ static void bnxt_re_shutdown(void *p)
         if (!rdev)
                 return;
 
-        bnxt_re_ib_unreg(rdev, false);
+        bnxt_re_ib_unreg(rdev);
 }
 
 static void bnxt_re_stop_irq(void *handle)
@@ -251,7 +251,7 @@ static struct bnxt_ulp_ops bnxt_re_ulp_ops = {
 /* Driver registration routines used to let the networking driver (bnxt_en)
  * to know that the RoCE driver is now installed
  */
-static int bnxt_re_unregister_netdev(struct bnxt_re_dev *rdev, bool lock_wait)
+static int bnxt_re_unregister_netdev(struct bnxt_re_dev *rdev)
 {
         struct bnxt_en_dev *en_dev;
         int rc;
@@ -260,14 +260,9 @@ static int bnxt_re_unregister_netdev(struct bnxt_re_dev *rdev, bool lock_wait)
                 return -EINVAL;
 
         en_dev = rdev->en_dev;
-        /* Acquire rtnl lock if it is not invokded from netdev event */
-        if (lock_wait)
-                rtnl_lock();
 
         rc = en_dev->en_ops->bnxt_unregister_device(rdev->en_dev,
                                                     BNXT_ROCE_ULP);
-        if (lock_wait)
-                rtnl_unlock();
         return rc;
 }
 
@@ -281,14 +276,12 @@ static int bnxt_re_register_netdev(struct bnxt_re_dev *rdev)
 
         en_dev = rdev->en_dev;
 
-        rtnl_lock();
         rc = en_dev->en_ops->bnxt_register_device(en_dev, BNXT_ROCE_ULP,
                                                   &bnxt_re_ulp_ops, rdev);
-        rtnl_unlock();
         return rc;
 }
 
-static int bnxt_re_free_msix(struct bnxt_re_dev *rdev, bool lock_wait)
+static int bnxt_re_free_msix(struct bnxt_re_dev *rdev)
 {
         struct bnxt_en_dev *en_dev;
         int rc;
@@ -298,13 +291,9 @@ static int bnxt_re_free_msix(struct bnxt_re_dev *rdev, bool lock_wait)
 
         en_dev = rdev->en_dev;
 
-        if (lock_wait)
-                rtnl_lock();
 
         rc = en_dev->en_ops->bnxt_free_msix(rdev->en_dev, BNXT_ROCE_ULP);
 
-        if (lock_wait)
-                rtnl_unlock();
         return rc;
 }
 
@@ -320,7 +309,6 @@ static int bnxt_re_request_msix(struct bnxt_re_dev *rdev)
 
         num_msix_want = min_t(u32, BNXT_RE_MAX_MSIX, num_online_cpus());
 
-        rtnl_lock();
         num_msix_got = en_dev->en_ops->bnxt_request_msix(en_dev, BNXT_ROCE_ULP,
                                                          rdev->msix_entries,
                                                          num_msix_want);
@@ -335,7 +323,6 @@ static int bnxt_re_request_msix(struct bnxt_re_dev *rdev)
         }
         rdev->num_msix = num_msix_got;
 done:
-        rtnl_unlock();
         return rc;
 }
 
@@ -358,24 +345,18 @@ static void bnxt_re_fill_fw_msg(struct bnxt_fw_msg *fw_msg, void *msg,
         fw_msg->timeout = timeout;
 }
 
-static int bnxt_re_net_ring_free(struct bnxt_re_dev *rdev, u16 fw_ring_id,
-                                 bool lock_wait)
+static int bnxt_re_net_ring_free(struct bnxt_re_dev *rdev, u16 fw_ring_id)
 {
         struct bnxt_en_dev *en_dev = rdev->en_dev;
         struct hwrm_ring_free_input req = {0};
         struct hwrm_ring_free_output resp;
         struct bnxt_fw_msg fw_msg;
-        bool do_unlock = false;
         int rc = -EINVAL;
 
         if (!en_dev)
                 return rc;
 
         memset(&fw_msg, 0, sizeof(fw_msg));
-        if (lock_wait) {
-                rtnl_lock();
-                do_unlock = true;
-        }
 
         bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_RING_FREE, -1, -1);
         req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
@@ -386,8 +367,6 @@ static int bnxt_re_net_ring_free(struct bnxt_re_dev *rdev, u16 fw_ring_id,
         if (rc)
                 dev_err(rdev_to_dev(rdev),
                         "Failed to free HW ring:%d :%#x", req.ring_id, rc);
-        if (do_unlock)
-                rtnl_unlock();
         return rc;
 }
 
@@ -405,7 +384,6 @@ static int bnxt_re_net_ring_alloc(struct bnxt_re_dev *rdev, dma_addr_t *dma_arr,
                 return rc;
 
         memset(&fw_msg, 0, sizeof(fw_msg));
-        rtnl_lock();
         bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_RING_ALLOC, -1, -1);
         req.enables = 0;
         req.page_tbl_addr =  cpu_to_le64(dma_arr[0]);
@@ -426,27 +404,21 @@ static int bnxt_re_net_ring_alloc(struct bnxt_re_dev *rdev, dma_addr_t *dma_arr,
         if (!rc)
                 *fw_ring_id = le16_to_cpu(resp.ring_id);
 
-        rtnl_unlock();
         return rc;
 }
 
 static int bnxt_re_net_stats_ctx_free(struct bnxt_re_dev *rdev,
-                                      u32 fw_stats_ctx_id, bool lock_wait)
+                                      u32 fw_stats_ctx_id)
 {
         struct bnxt_en_dev *en_dev = rdev->en_dev;
         struct hwrm_stat_ctx_free_input req = {0};
         struct bnxt_fw_msg fw_msg;
-        bool do_unlock = false;
         int rc = -EINVAL;
 
         if (!en_dev)
                 return rc;
 
         memset(&fw_msg, 0, sizeof(fw_msg));
-        if (lock_wait) {
-                rtnl_lock();
-                do_unlock = true;
-        }
 
         bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_STAT_CTX_FREE, -1, -1);
         req.stat_ctx_id = cpu_to_le32(fw_stats_ctx_id);
@@ -457,8 +429,6 @@ static int bnxt_re_net_stats_ctx_free(struct bnxt_re_dev *rdev,
                 dev_err(rdev_to_dev(rdev),
                         "Failed to free HW stats context %#x", rc);
 
-        if (do_unlock)
-                rtnl_unlock();
         return rc;
 }
 
@@ -478,7 +448,6 @@ static int bnxt_re_net_stats_ctx_alloc(struct bnxt_re_dev *rdev,
                 return rc;
 
         memset(&fw_msg, 0, sizeof(fw_msg));
-        rtnl_lock();
 
         bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_STAT_CTX_ALLOC, -1, -1);
         req.update_period_ms = cpu_to_le32(1000);
@@ -490,7 +459,6 @@ static int bnxt_re_net_stats_ctx_alloc(struct bnxt_re_dev *rdev,
         if (!rc)
                 *fw_stats_ctx_id = le32_to_cpu(resp.stat_ctx_id);
 
-        rtnl_unlock();
         return rc;
 }
 
@@ -929,19 +897,19 @@ fail:
         return rc;
 }
 
-static void bnxt_re_free_nq_res(struct bnxt_re_dev *rdev, bool lock_wait)
+static void bnxt_re_free_nq_res(struct bnxt_re_dev *rdev)
 {
         int i;
 
         for (i = 0; i < rdev->num_msix - 1; i++) {
-                bnxt_re_net_ring_free(rdev, rdev->nq[i].ring_id, lock_wait);
+                bnxt_re_net_ring_free(rdev, rdev->nq[i].ring_id);
                 bnxt_qplib_free_nq(&rdev->nq[i]);
         }
 }
 
-static void bnxt_re_free_res(struct bnxt_re_dev *rdev, bool lock_wait)
+static void bnxt_re_free_res(struct bnxt_re_dev *rdev)
 {
-        bnxt_re_free_nq_res(rdev, lock_wait);
+        bnxt_re_free_nq_res(rdev);
 
         if (rdev->qplib_res.dpi_tbl.max) {
                 bnxt_qplib_dealloc_dpi(&rdev->qplib_res,
@@ -1219,7 +1187,7 @@ static int bnxt_re_setup_qos(struct bnxt_re_dev *rdev)
         return 0;
 }
 
-static void bnxt_re_ib_unreg(struct bnxt_re_dev *rdev, bool lock_wait)
+static void bnxt_re_ib_unreg(struct bnxt_re_dev *rdev)
 {
         int i, rc;
 
@@ -1234,28 +1202,27 @@ static void bnxt_re_ib_unreg(struct bnxt_re_dev *rdev, bool lock_wait)
                 cancel_delayed_work(&rdev->worker);
 
         bnxt_re_cleanup_res(rdev);
-        bnxt_re_free_res(rdev, lock_wait);
+        bnxt_re_free_res(rdev);
 
         if (test_and_clear_bit(BNXT_RE_FLAG_RCFW_CHANNEL_EN, &rdev->flags)) {
                 rc = bnxt_qplib_deinit_rcfw(&rdev->rcfw);
                 if (rc)
                         dev_warn(rdev_to_dev(rdev),
                                  "Failed to deinitialize RCFW: %#x", rc);
-                bnxt_re_net_stats_ctx_free(rdev, rdev->qplib_ctx.stats.fw_id,
-                                           lock_wait);
+                bnxt_re_net_stats_ctx_free(rdev, rdev->qplib_ctx.stats.fw_id);
                 bnxt_qplib_free_ctx(rdev->en_dev->pdev, &rdev->qplib_ctx);
                 bnxt_qplib_disable_rcfw_channel(&rdev->rcfw);
-                bnxt_re_net_ring_free(rdev, rdev->rcfw.creq_ring_id, lock_wait);
+                bnxt_re_net_ring_free(rdev, rdev->rcfw.creq_ring_id);
                 bnxt_qplib_free_rcfw_channel(&rdev->rcfw);
         }
         if (test_and_clear_bit(BNXT_RE_FLAG_GOT_MSIX, &rdev->flags)) {
-                rc = bnxt_re_free_msix(rdev, lock_wait);
+                rc = bnxt_re_free_msix(rdev);
                 if (rc)
                         dev_warn(rdev_to_dev(rdev),
                                  "Failed to free MSI-X vectors: %#x", rc);
         }
         if (test_and_clear_bit(BNXT_RE_FLAG_NETDEV_REGISTERED, &rdev->flags)) {
-                rc = bnxt_re_unregister_netdev(rdev, lock_wait);
+                rc = bnxt_re_unregister_netdev(rdev);
                 if (rc)
                         dev_warn(rdev_to_dev(rdev),
                                  "Failed to unregister with netdev: %#x", rc);
@@ -1276,6 +1243,12 @@ static int bnxt_re_ib_reg(struct bnxt_re_dev *rdev)
 {
         int i, j, rc;
 
+        bool locked;
+
+        /* Acquire rtnl lock through out this function */
+        rtnl_lock();
+        locked = true;
+
         /* Registered a new RoCE device instance to netdev */
         rc = bnxt_re_register_netdev(rdev);
         if (rc) {
@@ -1374,12 +1347,16 @@ static int bnxt_re_ib_reg(struct bnxt_re_dev *rdev)
                 schedule_delayed_work(&rdev->worker, msecs_to_jiffies(30000));
         }
 
+        rtnl_unlock();
+        locked = false;
+
         /* Register ib dev */
         rc = bnxt_re_register_ib(rdev);
         if (rc) {
                 pr_err("Failed to register with IB: %#x\n", rc);
                 goto fail;
         }
+        set_bit(BNXT_RE_FLAG_IBDEV_REGISTERED, &rdev->flags);
         dev_info(rdev_to_dev(rdev), "Device registered successfully");
         for (i = 0; i < ARRAY_SIZE(bnxt_re_attributes); i++) {
                 rc = device_create_file(&rdev->ibdev.dev,
@@ -1395,7 +1372,6 @@ static int bnxt_re_ib_reg(struct bnxt_re_dev *rdev)
                         goto fail;
                 }
         }
-        set_bit(BNXT_RE_FLAG_IBDEV_REGISTERED, &rdev->flags);
         ib_get_eth_speed(&rdev->ibdev, 1, &rdev->active_speed,
                          &rdev->active_width);
         set_bit(BNXT_RE_FLAG_ISSUE_ROCE_STATS, &rdev->flags);
@@ -1404,17 +1380,21 @@ static int bnxt_re_ib_reg(struct bnxt_re_dev *rdev)
 
         return 0;
 free_sctx:
-        bnxt_re_net_stats_ctx_free(rdev, rdev->qplib_ctx.stats.fw_id, true);
+        bnxt_re_net_stats_ctx_free(rdev, rdev->qplib_ctx.stats.fw_id);
 free_ctx:
         bnxt_qplib_free_ctx(rdev->en_dev->pdev, &rdev->qplib_ctx);
 disable_rcfw:
         bnxt_qplib_disable_rcfw_channel(&rdev->rcfw);
 free_ring:
-        bnxt_re_net_ring_free(rdev, rdev->rcfw.creq_ring_id, true);
+        bnxt_re_net_ring_free(rdev, rdev->rcfw.creq_ring_id);
 free_rcfw:
         bnxt_qplib_free_rcfw_channel(&rdev->rcfw);
 fail:
-        bnxt_re_ib_unreg(rdev, true);
+        if (!locked)
+                rtnl_lock();
+        bnxt_re_ib_unreg(rdev);
+        rtnl_unlock();
+
         return rc;
 }
 
@@ -1567,7 +1547,7 @@ static int bnxt_re_netdev_event(struct notifier_block *notifier,
                  */
                 if (atomic_read(&rdev->sched_count) > 0)
                         goto exit;
-                bnxt_re_ib_unreg(rdev, false);
+                bnxt_re_ib_unreg(rdev);
                 bnxt_re_remove_one(rdev);
                 bnxt_re_dev_unreg(rdev);
                 break;
@@ -1646,7 +1626,10 @@ static void __exit bnxt_re_mod_exit(void)
                  */
                 flush_workqueue(bnxt_re_wq);
                 bnxt_re_dev_stop(rdev);
-                bnxt_re_ib_unreg(rdev, true);
+                /* Acquire the rtnl_lock as the L2 resources are freed here */
+                rtnl_lock();
+                bnxt_re_ib_unreg(rdev);
+                rtnl_unlock();
                 bnxt_re_remove_one(rdev);
                 bnxt_re_dev_unreg(rdev);
         }
diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index 2c19bf772451..e1668bcc2d13 100644
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -6733,6 +6733,7 @@ void start_freeze_handling(struct hfi1_pportdata *ppd, int flags)
         struct hfi1_devdata *dd = ppd->dd;
         struct send_context *sc;
         int i;
+        int sc_flags;
 
         if (flags & FREEZE_SELF)
                 write_csr(dd, CCE_CTRL, CCE_CTRL_SPC_FREEZE_SMASK);
@@ -6743,11 +6744,13 @@ void start_freeze_handling(struct hfi1_pportdata *ppd, int flags)
         /* notify all SDMA engines that they are going into a freeze */
         sdma_freeze_notify(dd, !!(flags & FREEZE_LINK_DOWN));
 
+        sc_flags = SCF_FROZEN | SCF_HALTED | (flags & FREEZE_LINK_DOWN ?
+                                              SCF_LINK_DOWN : 0);
         /* do halt pre-handling on all enabled send contexts */
         for (i = 0; i < dd->num_send_contexts; i++) {
                 sc = dd->send_contexts[i].sc;
                 if (sc && (sc->flags & SCF_ENABLED))
-                        sc_stop(sc, SCF_FROZEN | SCF_HALTED);
+                        sc_stop(sc, sc_flags);
         }
 
         /* Send context are frozen. Notify user space */
@@ -10674,6 +10677,7 @@ int set_link_state(struct hfi1_pportdata *ppd, u32 state)
                 add_rcvctrl(dd, RCV_CTRL_RCV_PORT_ENABLE_SMASK);
 
                 handle_linkup_change(dd, 1);
+                pio_kernel_linkup(dd);
 
                 /*
                  * After link up, a new link width will have been set.
diff --git a/drivers/infiniband/hw/hfi1/pio.c b/drivers/infiniband/hw/hfi1/pio.c
index c2c1cba5b23b..752057647f09 100644
--- a/drivers/infiniband/hw/hfi1/pio.c
+++ b/drivers/infiniband/hw/hfi1/pio.c
@@ -86,6 +86,7 @@ void pio_send_control(struct hfi1_devdata *dd, int op)
         unsigned long flags;
         int write = 1;  /* write sendctrl back */
         int flush = 0;  /* re-read sendctrl to make sure it is flushed */
+        int i;
 
         spin_lock_irqsave(&dd->sendctrl_lock, flags);
 
@@ -95,9 +96,13 @@ void pio_send_control(struct hfi1_devdata *dd, int op)
                 reg |= SEND_CTRL_SEND_ENABLE_SMASK;
         /* Fall through */
         case PSC_DATA_VL_ENABLE:
+                mask = 0;
+                for (i = 0; i < ARRAY_SIZE(dd->vld); i++)
+                        if (!dd->vld[i].mtu)
+                                mask |= BIT_ULL(i);
                 /* Disallow sending on VLs not enabled */
-                mask = (((~0ull) << num_vls) & SEND_CTRL_UNSUPPORTED_VL_MASK) <<
-                                SEND_CTRL_UNSUPPORTED_VL_SHIFT;
+                mask = (mask & SEND_CTRL_UNSUPPORTED_VL_MASK) <<
+                        SEND_CTRL_UNSUPPORTED_VL_SHIFT;
                 reg = (reg & ~SEND_CTRL_UNSUPPORTED_VL_SMASK) | mask;
                 break;
         case PSC_GLOBAL_DISABLE:
@@ -921,20 +926,18 @@ void sc_free(struct send_context *sc)
 void sc_disable(struct send_context *sc)
 {
         u64 reg;
-        unsigned long flags;
         struct pio_buf *pbuf;
 
         if (!sc)
                 return;
 
         /* do all steps, even if already disabled */
-        spin_lock_irqsave(&sc->alloc_lock, flags);
+        spin_lock_irq(&sc->alloc_lock);
         reg = read_kctxt_csr(sc->dd, sc->hw_context, SC(CTRL));
         reg &= ~SC(CTRL_CTXT_ENABLE_SMASK);
         sc->flags &= ~SCF_ENABLED;
         sc_wait_for_packet_egress(sc, 1);
         write_kctxt_csr(sc->dd, sc->hw_context, SC(CTRL), reg);
-        spin_unlock_irqrestore(&sc->alloc_lock, flags);
 
         /*
          * Flush any waiters.  Once the context is disabled,
@@ -944,7 +947,7 @@ void sc_disable(struct send_context *sc)
          * proceed with the flush.
          */
         udelay(1);
-        spin_lock_irqsave(&sc->release_lock, flags);
+        spin_lock(&sc->release_lock);
         if (sc->sr) {   /* this context has a shadow ring */
                 while (sc->sr_tail != sc->sr_head) {
                         pbuf = &sc->sr[sc->sr_tail].pbuf;
@@ -955,7 +958,8 @@ void sc_disable(struct send_context *sc)
                                 sc->sr_tail = 0;
                 }
         }
-        spin_unlock_irqrestore(&sc->release_lock, flags);
+        spin_unlock(&sc->release_lock);
+        spin_unlock_irq(&sc->alloc_lock);
 }
 
 /* return SendEgressCtxtStatus.PacketOccupancy */
@@ -1178,11 +1182,39 @@ void pio_kernel_unfreeze(struct hfi1_devdata *dd)
                 sc = dd->send_contexts[i].sc;
                 if (!sc || !(sc->flags & SCF_FROZEN) || sc->type == SC_USER)
                         continue;
+                if (sc->flags & SCF_LINK_DOWN)
+                        continue;
 
                 sc_enable(sc);  /* will clear the sc frozen flag */
         }
 }
 
+/**
+ * pio_kernel_linkup() - Re-enable send contexts after linkup event
+ * @dd: valid devive data
+ *
+ * When the link goes down, the freeze path is taken.  However, a link down
+ * event is different from a freeze because if the send context is re-enabled
+ * whowever is sending data will start sending data again, which will hang
+ * any QP that is sending data.
+ *
+ * The freeze path now looks at the type of event that occurs and takes this
+ * path for link down event.
+ */
+void pio_kernel_linkup(struct hfi1_devdata *dd)
+{
+        struct send_context *sc;
+        int i;
+
+        for (i = 0; i < dd->num_send_contexts; i++) {
+                sc = dd->send_contexts[i].sc;
+                if (!sc || !(sc->flags & SCF_LINK_DOWN) || sc->type == SC_USER)
+                        continue;
+
+                sc_enable(sc);  /* will clear the sc link down flag */
+        }
+}
+
 /*
  * Wait for the SendPioInitCtxt.PioInitInProgress bit to clear.
  * Returns:
@@ -1382,11 +1414,10 @@ void sc_stop(struct send_context *sc, int flag)
 {
         unsigned long flags;
 
-        /* mark the context */
-        sc->flags |= flag;
-
         /* stop buffer allocations */
         spin_lock_irqsave(&sc->alloc_lock, flags);
+        /* mark the context */
+        sc->flags |= flag;
         sc->flags &= ~SCF_ENABLED;
         spin_unlock_irqrestore(&sc->alloc_lock, flags);
         wake_up(&sc->halt_wait);
diff --git a/drivers/infiniband/hw/hfi1/pio.h b/drivers/infiniband/hw/hfi1/pio.h
index 058b08f459ab..aaf372c3e5d6 100644
--- a/drivers/infiniband/hw/hfi1/pio.h
+++ b/drivers/infiniband/hw/hfi1/pio.h
@@ -139,6 +139,7 @@ struct send_context {
 #define SCF_IN_FREE 0x02
 #define SCF_HALTED  0x04
 #define SCF_FROZEN  0x08
+#define SCF_LINK_DOWN 0x10
 
 struct send_context_info {
         struct send_context *sc;        /* allocated working context */
@@ -306,6 +307,7 @@ void set_pio_integrity(struct send_context *sc);
 void pio_reset_all(struct hfi1_devdata *dd);
 void pio_freeze(struct hfi1_devdata *dd);
 void pio_kernel_unfreeze(struct hfi1_devdata *dd);
+void pio_kernel_linkup(struct hfi1_devdata *dd);
 
 /* global PIO send control operations */
 #define PSC_GLOBAL_ENABLE 0
diff --git a/drivers/infiniband/hw/hfi1/user_sdma.c b/drivers/infiniband/hw/hfi1/user_sdma.c
index a3a7b33196d6..5c88706121c1 100644
--- a/drivers/infiniband/hw/hfi1/user_sdma.c
+++ b/drivers/infiniband/hw/hfi1/user_sdma.c
@@ -828,7 +828,7 @@ static int user_sdma_send_pkts(struct user_sdma_request *req, unsigned maxpkts)
                         if (READ_ONCE(iovec->offset) == iovec->iov.iov_len) {
                                 if (++req->iov_idx == req->data_iovs) {
                                         ret = -EFAULT;
-                                        goto free_txreq;
+                                        goto free_tx;
                                 }
                                 iovec = &req->iovs[req->iov_idx];
                                 WARN_ON(iovec->offset);
diff --git a/drivers/infiniband/hw/hfi1/verbs.c b/drivers/infiniband/hw/hfi1/verbs.c
index 13374c727b14..a7c586a5589d 100644
--- a/drivers/infiniband/hw/hfi1/verbs.c
+++ b/drivers/infiniband/hw/hfi1/verbs.c
@@ -1582,6 +1582,7 @@ static int hfi1_check_ah(struct ib_device *ibdev, struct rdma_ah_attr *ah_attr)
         struct hfi1_pportdata *ppd;
         struct hfi1_devdata *dd;
         u8 sc5;
+        u8 sl;
 
         if (hfi1_check_mcast(rdma_ah_get_dlid(ah_attr)) &&
             !(rdma_ah_get_ah_flags(ah_attr) & IB_AH_GRH))
@@ -1590,8 +1591,13 @@ static int hfi1_check_ah(struct ib_device *ibdev, struct rdma_ah_attr *ah_attr)
         /* test the mapping for validity */
         ibp = to_iport(ibdev, rdma_ah_get_port_num(ah_attr));
         ppd = ppd_from_ibp(ibp);
-        sc5 = ibp->sl_to_sc[rdma_ah_get_sl(ah_attr)];
         dd = dd_from_ppd(ppd);
+
+        sl = rdma_ah_get_sl(ah_attr);
+        if (sl >= ARRAY_SIZE(ibp->sl_to_sc))
+                return -EINVAL;
+
+        sc5 = ibp->sl_to_sc[sl];
         if (sc_to_vlt(dd, sc5) > num_vls && sc_to_vlt(dd, sc5) != 0xf)
                 return -EINVAL;
         return 0;
diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index ac116d63e466..f2f11e652dcd 100644
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -723,6 +723,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
                 attrs, MLX5_IB_ATTR_DEVX_OBJ_CREATE_HANDLE);
         struct mlx5_ib_ucontext *c = to_mucontext(uobj->context);
         struct mlx5_ib_dev *dev = to_mdev(c->ibucontext.device);
+        u32 out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)];
         struct devx_obj *obj;
         int err;
 
@@ -754,10 +755,12 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
 
         err = uverbs_copy_to(attrs, MLX5_IB_ATTR_DEVX_OBJ_CREATE_CMD_OUT, cmd_out, cmd_out_len);
         if (err)
-                goto obj_free;
+                goto obj_destroy;
 
         return 0;
 
+obj_destroy:
+        mlx5_cmd_exec(obj->mdev, obj->dinbox, obj->dinlen, out, sizeof(out));
 obj_free:
         kfree(obj);
         return err;
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 444d16520506..0b34e909505f 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -2951,7 +2951,7 @@ static int srp_reset_device(struct scsi_cmnd *scmnd)
 {
         struct srp_target_port *target = host_to_target(scmnd->device->host);
         struct srp_rdma_ch *ch;
-        int i;
+        int i, j;
         u8 status;
 
         shost_printk(KERN_ERR, target->scsi_host, "SRP reset_device called\n");
@@ -2965,8 +2965,8 @@ static int srp_reset_device(struct scsi_cmnd *scmnd)
 
         for (i = 0; i < target->ch_count; i++) {
                 ch = &target->ch[i];
-                for (i = 0; i < target->req_ring_size; ++i) {
-                        struct srp_request *req = &ch->req_ring[i];
+                for (j = 0; j < target->req_ring_size; ++j) {
+                        struct srp_request *req = &ch->req_ring[j];
 
                         srp_finish_req(ch, req, scmnd->device, DID_RESET << 16);
                 }
diff --git a/drivers/input/keyboard/atakbd.c b/drivers/input/keyboard/atakbd.c
index 6f62da2909ec..6caee807cafa 100644
--- a/drivers/input/keyboard/atakbd.c
+++ b/drivers/input/keyboard/atakbd.c
@@ -75,8 +75,7 @@ MODULE_LICENSE("GPL");
  */
 
 
-static unsigned char atakbd_keycode[0x72] = {   /* American layout */
-        [0]      = KEY_GRAVE,
+static unsigned char atakbd_keycode[0x73] = {   /* American layout */
         [1]      = KEY_ESC,
         [2]      = KEY_1,
         [3]      = KEY_2,
@@ -117,9 +116,9 @@ static unsigned char atakbd_keycode[0x72] = {	/* American layout */
         [38]     = KEY_L,
         [39]     = KEY_SEMICOLON,
         [40]     = KEY_APOSTROPHE,
-        [41]     = KEY_BACKSLASH,       /* FIXME, '#' */
+        [41]     = KEY_GRAVE,
         [42]     = KEY_LEFTSHIFT,
-        [43]     = KEY_GRAVE,           /* FIXME: '~' */
+        [43]     = KEY_BACKSLASH,
         [44]     = KEY_Z,
         [45]     = KEY_X,
         [46]     = KEY_C,
@@ -145,45 +144,34 @@ static unsigned char atakbd_keycode[0x72] = {	/* American layout */
         [66]     = KEY_F8,
         [67]     = KEY_F9,
         [68]     = KEY_F10,
-        [69]     = KEY_ESC,
-        [70]     = KEY_DELETE,
-        [71]     = KEY_KP7,
-        [72]     = KEY_KP8,
-        [73]     = KEY_KP9,
+        [71]     = KEY_HOME,
+        [72]     = KEY_UP,
         [74]     = KEY_KPMINUS,
-        [75]     = KEY_KP4,
-        [76]     = KEY_KP5,
-        [77]     = KEY_KP6,
+        [75]     = KEY_LEFT,
+        [77]     = KEY_RIGHT,
         [78]     = KEY_KPPLUS,
-        [79]     = KEY_KP1,
-        [80]     = KEY_KP2,
-        [81]     = KEY_KP3,
-        [82]     = KEY_KP0,
-        [83]     = KEY_KPDOT,
-        [90]     = KEY_KPLEFTPAREN,
-        [91]     = KEY_KPRIGHTPAREN,
-        [92]     = KEY_KPASTERISK,      /* FIXME */
-        [93]     = KEY_KPASTERISK,
-        [94]     = KEY_KPPLUS,
-        [95]     = KEY_HELP,
+        [80]     = KEY_DOWN,
+        [82]     = KEY_INSERT,
+        [83]     = KEY_DELETE,
         [96]     = KEY_102ND,
-        [97]     = KEY_KPASTERISK,      /* FIXME */
-        [98]     = KEY_KPSLASH,
+        [97]     = KEY_UNDO,
+        [98]     = KEY_HELP,
         [99]     = KEY_KPLEFTPAREN,
         [100]    = KEY_KPRIGHTPAREN,
         [101]    = KEY_KPSLASH,
         [102]    = KEY_KPASTERISK,
-        [103]    = KEY_UP,
-        [104]    = KEY_KPASTERISK,      /* FIXME */
-        [105]    = KEY_LEFT,
-        [106]    = KEY_RIGHT,
-        [107]    = KEY_KPASTERISK,      /* FIXME */
-        [108]    = KEY_DOWN,
-        [109]    = KEY_KPASTERISK,      /* FIXME */
-        [110]    = KEY_KPASTERISK,      /* FIXME */
-        [111]    = KEY_KPASTERISK,      /* FIXME */
-        [112]    = KEY_KPASTERISK,      /* FIXME */
-        [113]    = KEY_KPASTERISK       /* FIXME */
+        [103]    = KEY_KP7,
+        [104]    = KEY_KP8,
+        [105]    = KEY_KP9,
+        [106]    = KEY_KP4,
+        [107]    = KEY_KP5,
+        [108]    = KEY_KP6,
+        [109]    = KEY_KP1,
+        [110]    = KEY_KP2,
+        [111]    = KEY_KP3,
+        [112]    = KEY_KP0,
+        [113]    = KEY_KPDOT,
+        [114]    = KEY_KPENTER,
 };
 
 static struct input_dev *atakbd_dev;
@@ -191,21 +179,15 @@ static struct input_dev *atakbd_dev;
 static void atakbd_interrupt(unsigned char scancode, char down)
 {
 
-        if (scancode < 0x72) {          /* scancodes < 0xf2 are keys */
+        if (scancode < 0x73) {          /* scancodes < 0xf3 are keys */
 
                 // report raw events here?
 
                 scancode = atakbd_keycode[scancode];
 
-                if (scancode == KEY_CAPSLOCK) { /* CapsLock is a toggle switch key on Amiga */
-                        input_report_key(atakbd_dev, scancode, 1);
-                        input_report_key(atakbd_dev, scancode, 0);
-                        input_sync(atakbd_dev);
-                } else {
-                        input_report_key(atakbd_dev, scancode, down);
-                        input_sync(atakbd_dev);
-                }
-        } else                          /* scancodes >= 0xf2 are mouse data, most likely */
+                input_report_key(atakbd_dev, scancode, down);
+                input_sync(atakbd_dev);
+        } else                          /* scancodes >= 0xf3 are mouse data, most likely */
                 printk(KERN_INFO "atakbd: unhandled scancode %x\n", scancode);
 
         return;
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 96a887f33698..eb14ddf69346 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -410,7 +410,7 @@ static int uinput_validate_absinfo(struct input_dev *dev, unsigned int code,
         min = abs->minimum;
         max = abs->maximum;
 
-        if ((min != 0 || max != 0) && max <= min) {
+        if ((min != 0 || max != 0) && max < min) {
                 printk(KERN_DEBUG
                        "%s: invalid abs[%02x] min:%d max:%d\n",
                        UINPUT_NAME, code, min, max);
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 44f57cf6675b..2d95e8d93cc7 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1178,6 +1178,8 @@ static const struct dmi_system_id elantech_dmi_has_middle_button[] = {
 static const char * const middle_button_pnp_ids[] = {
         "LEN2131", /* ThinkPad P52 w/ NFC */
         "LEN2132", /* ThinkPad P52 */
+        "LEN2133", /* ThinkPad P72 w/ NFC */
+        "LEN2134", /* ThinkPad P72 */
         NULL
 };
 
diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c
index 80e69bb8283e..83ac8c128192 100644
--- a/drivers/input/touchscreen/egalax_ts.c
+++ b/drivers/input/touchscreen/egalax_ts.c
@@ -241,6 +241,9 @@ static int __maybe_unused egalax_ts_suspend(struct device *dev)
         struct i2c_client *client = to_i2c_client(dev);
         int ret;
 
+        if (device_may_wakeup(dev))
+                return enable_irq_wake(client->irq);
+
         ret = i2c_master_send(client, suspend_cmd, MAX_I2C_DATA_LEN);
         return ret > 0 ? 0 : ret;
 }
@@ -249,6 +252,9 @@ static int __maybe_unused egalax_ts_resume(struct device *dev)
 {
         struct i2c_client *client = to_i2c_client(dev);
 
+        if (device_may_wakeup(dev))
+                return disable_irq_wake(client->irq);
+
         return egalax_wake_up_device(client);
 }
 
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 4e04fff23977..73e47d93e7a0 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -246,7 +246,13 @@ static u16 get_alias(struct device *dev)
 
         /* The callers make sure that get_device_id() does not fail here */
         devid = get_device_id(dev);
+
+        /* For ACPI HID devices, we simply return the devid as such */
+        if (!dev_is_pci(dev))
+                return devid;
+
         ivrs_alias = amd_iommu_alias_table[devid];
+
         pci_for_each_dma_alias(pdev, __last_alias, &pci_alias);
 
         if (ivrs_alias == pci_alias)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 5f3f10cf9d9d..bedc801b06a0 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2540,9 +2540,9 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
         if (dev && dev_is_pci(dev) && info->pasid_supported) {
                 ret = intel_pasid_alloc_table(dev);
                 if (ret) {
-                        __dmar_remove_one_dev_info(info);
-                        spin_unlock_irqrestore(&device_domain_lock, flags);
-                        return NULL;
+                        pr_warn("No pasid table for %s, pasid disabled\n",
+                                dev_name(dev));
+                        info->pasid_supported = 0;
                 }
         }
         spin_unlock_irqrestore(&device_domain_lock, flags);
diff --git a/drivers/iommu/intel-pasid.h b/drivers/iommu/intel-pasid.h
index 1c05ed6fc5a5..1fb5e12b029a 100644
--- a/drivers/iommu/intel-pasid.h
+++ b/drivers/iommu/intel-pasid.h
@@ -11,7 +11,7 @@
 #define __INTEL_PASID_H
 
 #define PASID_MIN                       0x1
-#define PASID_MAX                       0x100000
+#define PASID_MAX                       0x20000
 
 struct pasid_entry {
         u64 val;
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 258115b10fa9..ad3e2b97469e 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1241,6 +1241,12 @@ err_unprepare_clocks:
 
 static void rk_iommu_shutdown(struct platform_device *pdev)
 {
+        struct rk_iommu *iommu = platform_get_drvdata(pdev);
+        int i = 0, irq;
+
+        while ((irq = platform_get_irq(pdev, i++)) != -ENXIO)
+                devm_free_irq(iommu->dev, irq, iommu);
+
         pm_runtime_force_suspend(&pdev->dev);
 }
 
diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
index 83504dd8100a..954dad29e6e8 100644
--- a/drivers/md/bcache/bcache.h
+++ b/drivers/md/bcache/bcache.h
@@ -965,6 +965,7 @@ void bch_prio_write(struct cache *ca);
 void bch_write_bdev_super(struct cached_dev *dc, struct closure *parent);
 
 extern struct workqueue_struct *bcache_wq;
+extern struct workqueue_struct *bch_journal_wq;
 extern struct mutex bch_register_lock;
 extern struct list_head bch_cache_sets;
 
diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c
index 6116bbf870d8..522c7426f3a0 100644
--- a/drivers/md/bcache/journal.c
+++ b/drivers/md/bcache/journal.c
@@ -485,7 +485,7 @@ static void do_journal_discard(struct cache *ca)
 
                 closure_get(&ca->set->cl);
                 INIT_WORK(&ja->discard_work, journal_discard_work);
-                schedule_work(&ja->discard_work);
+                queue_work(bch_journal_wq, &ja->discard_work);
         }
 }
 
@@ -592,7 +592,7 @@ static void journal_write_done(struct closure *cl)
                 : &j->w[0];
 
         __closure_wake_up(&w->wait);
-        continue_at_nobarrier(cl, journal_write, system_wq);
+        continue_at_nobarrier(cl, journal_write, bch_journal_wq);
 }
 
 static void journal_write_unlock(struct closure *cl)
@@ -627,7 +627,7 @@ static void journal_write_unlocked(struct closure *cl)
                 spin_unlock(&c->journal.lock);
 
                 btree_flush_write(c);
-                continue_at(cl, journal_write, system_wq);
+                continue_at(cl, journal_write, bch_journal_wq);
                 return;
         }
 
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index 94c756c66bd7..30ba9aeb5ee8 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -47,6 +47,7 @@ static int bcache_major;
 static DEFINE_IDA(bcache_device_idx);
 static wait_queue_head_t unregister_wait;
 struct workqueue_struct *bcache_wq;
+struct workqueue_struct *bch_journal_wq;
 
 #define BTREE_MAX_PAGES         (256 * 1024 / PAGE_SIZE)
 /* limitation of partitions number on single bcache device */
@@ -2341,6 +2342,9 @@ static void bcache_exit(void)
                 kobject_put(bcache_kobj);
         if (bcache_wq)
                 destroy_workqueue(bcache_wq);
+        if (bch_journal_wq)
+                destroy_workqueue(bch_journal_wq);
+
         if (bcache_major)
                 unregister_blkdev(bcache_major, "bcache");
         unregister_reboot_notifier(&reboot);
@@ -2370,6 +2374,10 @@ static int __init bcache_init(void)
         if (!bcache_wq)
                 goto err;
 
+        bch_journal_wq = alloc_workqueue("bch_journal", WQ_MEM_RECLAIM, 0);
+        if (!bch_journal_wq)
+                goto err;
+
         bcache_kobj = kobject_create_and_add("bcache", fs_kobj);
         if (!bcache_kobj)
                 goto err;
diff --git a/drivers/media/v4l2-core/v4l2-event.c b/drivers/media/v4l2-core/v4l2-event.c
index 127fe6eb91d9..a3ef1f50a4b3 100644
--- a/drivers/media/v4l2-core/v4l2-event.c
+++ b/drivers/media/v4l2-core/v4l2-event.c
@@ -115,14 +115,6 @@ static void __v4l2_event_queue_fh(struct v4l2_fh *fh, const struct v4l2_event *e
         if (sev == NULL)
                 return;
 
-        /*
-         * If the event has been added to the fh->subscribed list, but its
-         * add op has not completed yet elems will be 0, treat this as
-         * not being subscribed.
-         */
-        if (!sev->elems)
-                return;
-
         /* Increase event sequence number on fh. */
         fh->sequence++;
 
@@ -208,6 +200,7 @@ int v4l2_event_subscribe(struct v4l2_fh *fh,
         struct v4l2_subscribed_event *sev, *found_ev;
         unsigned long flags;
         unsigned i;
+        int ret = 0;
 
         if (sub->type == V4L2_EVENT_ALL)
                 return -EINVAL;
@@ -225,31 +218,36 @@ int v4l2_event_subscribe(struct v4l2_fh *fh,
         sev->flags = sub->flags;
         sev->fh = fh;
         sev->ops = ops;
+        sev->elems = elems;
+
+        mutex_lock(&fh->subscribe_lock);
 
         spin_lock_irqsave(&fh->vdev->fh_lock, flags);
         found_ev = v4l2_event_subscribed(fh, sub->type, sub->id);
-        if (!found_ev)
-                list_add(&sev->list, &fh->subscribed);
         spin_unlock_irqrestore(&fh->vdev->fh_lock, flags);
 
         if (found_ev) {
+                /* Already listening */
                 kvfree(sev);
-                return 0; /* Already listening */
+                goto out_unlock;
         }
 
         if (sev->ops && sev->ops->add) {
-                int ret = sev->ops->add(sev, elems);
+                ret = sev->ops->add(sev, elems);
                 if (ret) {
-                        sev->ops = NULL;
-                        v4l2_event_unsubscribe(fh, sub);
-                        return ret;
+                        kvfree(sev);
+                        goto out_unlock;
                 }
         }
 
-        /* Mark as ready for use */
-        sev->elems = elems;
+        spin_lock_irqsave(&fh->vdev->fh_lock, flags);
+        list_add(&sev->list, &fh->subscribed);
+        spin_unlock_irqrestore(&fh->vdev->fh_lock, flags);
 
-        return 0;
+out_unlock:
+        mutex_unlock(&fh->subscribe_lock);
+
+        return ret;
 }
 EXPORT_SYMBOL_GPL(v4l2_event_subscribe);
 
@@ -288,6 +286,8 @@ int v4l2_event_unsubscribe(struct v4l2_fh *fh,
                 return 0;
         }
 
+        mutex_lock(&fh->subscribe_lock);
+
         spin_lock_irqsave(&fh->vdev->fh_lock, flags);
 
         sev = v4l2_event_subscribed(fh, sub->type, sub->id);
@@ -305,6 +305,8 @@ int v4l2_event_unsubscribe(struct v4l2_fh *fh,
         if (sev && sev->ops && sev->ops->del)
                 sev->ops->del(sev);
 
+        mutex_unlock(&fh->subscribe_lock);
+
         kvfree(sev);
 
         return 0;
diff --git a/drivers/media/v4l2-core/v4l2-fh.c b/drivers/media/v4l2-core/v4l2-fh.c
index 3895999bf880..c91a7bd3ecfc 100644
--- a/drivers/media/v4l2-core/v4l2-fh.c
+++ b/drivers/media/v4l2-core/v4l2-fh.c
@@ -45,6 +45,7 @@ void v4l2_fh_init(struct v4l2_fh *fh, struct video_device *vdev)
         INIT_LIST_HEAD(&fh->available);
         INIT_LIST_HEAD(&fh->subscribed);
         fh->sequence = -1;
+        mutex_init(&fh->subscribe_lock);
 }
 EXPORT_SYMBOL_GPL(v4l2_fh_init);
 
@@ -90,6 +91,7 @@ void v4l2_fh_exit(struct v4l2_fh *fh)
                 return;
         v4l_disable_media_source(fh->vdev);
         v4l2_event_unsubscribe_all(fh);
+        mutex_destroy(&fh->subscribe_lock);
         fh->vdev = NULL;
 }
 EXPORT_SYMBOL_GPL(v4l2_fh_exit);
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index abf9e884386c..f57f5de54206 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -235,7 +235,7 @@ int mmc_of_parse(struct mmc_host *host)
                         host->caps |= MMC_CAP_NEEDS_POLL;
 
                 ret = mmc_gpiod_request_cd(host, "cd", 0, true,
-                                           cd_debounce_delay_ms,
+                                           cd_debounce_delay_ms * 1000,
                                            &cd_gpio_invert);
                 if (!ret)
                         dev_info(host->parent, "Got CD GPIO\n");
diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c
index 2a833686784b..86803a3a04dc 100644
--- a/drivers/mmc/core/slot-gpio.c
+++ b/drivers/mmc/core/slot-gpio.c
@@ -271,7 +271,7 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id,
         if (debounce) {
                 ret = gpiod_set_debounce(desc, debounce);
                 if (ret < 0)
-                        ctx->cd_debounce_delay_ms = debounce;
+                        ctx->cd_debounce_delay_ms = debounce / 1000;
         }
 
         if (gpio_invert)
diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
index 890f192dedbd..5389c4821882 100644
--- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
@@ -498,7 +498,8 @@ static const struct soc_device_attribute gen3_soc_whitelist[] = {
 
 static int renesas_sdhi_sys_dmac_probe(struct platform_device *pdev)
 {
-        if (of_device_get_match_data(&pdev->dev) == &of_rcar_gen3_compatible &&
+        if ((of_device_get_match_data(&pdev->dev) == &of_rcar_gen3_compatible ||
+            of_device_get_match_data(&pdev->dev) == &of_rcar_r8a7795_compatible) &&
             !soc_device_match(gen3_soc_whitelist))
                 return -ENODEV;
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
index b8f75a22fb6c..f152da1ce046 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
@@ -753,7 +753,6 @@ struct cpl_abort_req_rss {
 };
 
 struct cpl_abort_req_rss6 {
-        WR_HDR;
         union opcode_tid ot;
         __be32 srqidx_status;
 };
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 5a9562881d4e..9fe3fff818b8 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -537,8 +537,10 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
 
         INIT_WORK(&ctrl->ana_work, nvme_ana_work);
         ctrl->ana_log_buf = kmalloc(ctrl->ana_log_size, GFP_KERNEL);
-        if (!ctrl->ana_log_buf)
+        if (!ctrl->ana_log_buf) {
+                error = -ENOMEM;
                 goto out;
+        }
 
         error = nvme_read_ana_log(ctrl, true);
         if (error)
@@ -547,7 +549,7 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
 out_free_ana_log_buf:
         kfree(ctrl->ana_log_buf);
 out:
-        return -ENOMEM;
+        return error;
 }
 
 void nvme_mpath_uninit(struct nvme_ctrl *ctrl)
diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c
index 778c4f76a884..2153956a0b20 100644
--- a/drivers/pci/controller/dwc/pcie-designware.c
+++ b/drivers/pci/controller/dwc/pcie-designware.c
@@ -135,7 +135,7 @@ static void dw_pcie_prog_outbound_atu_unroll(struct dw_pcie *pci, int index,
                 if (val & PCIE_ATU_ENABLE)
                         return;
 
-                usleep_range(LINK_WAIT_IATU_MIN, LINK_WAIT_IATU_MAX);
+                mdelay(LINK_WAIT_IATU);
         }
         dev_err(pci->dev, "Outbound iATU is not being enabled\n");
 }
@@ -178,7 +178,7 @@ void dw_pcie_prog_outbound_atu(struct dw_pcie *pci, int index, int type,
                 if (val & PCIE_ATU_ENABLE)
                         return;
 
-                usleep_range(LINK_WAIT_IATU_MIN, LINK_WAIT_IATU_MAX);
+                mdelay(LINK_WAIT_IATU);
         }
         dev_err(pci->dev, "Outbound iATU is not being enabled\n");
 }
@@ -236,7 +236,7 @@ static int dw_pcie_prog_inbound_atu_unroll(struct dw_pcie *pci, int index,
                 if (val & PCIE_ATU_ENABLE)
                         return 0;
 
-                usleep_range(LINK_WAIT_IATU_MIN, LINK_WAIT_IATU_MAX);
+                mdelay(LINK_WAIT_IATU);
         }
         dev_err(pci->dev, "Inbound iATU is not being enabled\n");
 
@@ -282,7 +282,7 @@ int dw_pcie_prog_inbound_atu(struct dw_pcie *pci, int index, int bar,
                 if (val & PCIE_ATU_ENABLE)
                         return 0;
 
-                usleep_range(LINK_WAIT_IATU_MIN, LINK_WAIT_IATU_MAX);
+                mdelay(LINK_WAIT_IATU);
         }
         dev_err(pci->dev, "Inbound iATU is not being enabled\n");
 
diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
index 96126fd8403c..9f1a5e399b70 100644
--- a/drivers/pci/controller/dwc/pcie-designware.h
+++ b/drivers/pci/controller/dwc/pcie-designware.h
@@ -26,8 +26,7 @@
 
 /* Parameters for the waiting for iATU enabled routine */
 #define LINK_WAIT_MAX_IATU_RETRIES      5
-#define LINK_WAIT_IATU_MIN              9000
-#define LINK_WAIT_IATU_MAX              10000
+#define LINK_WAIT_IATU                  9
 
 /* Synopsys-specific PCIe configuration registers */
 #define PCIE_PORT_LINK_CONTROL          0x710
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index ef0b1b6ba86f..12afa7fdf77e 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -457,17 +457,18 @@ static void acpiphp_native_scan_bridge(struct pci_dev *bridge)
 /**
  * enable_slot - enable, configure a slot
  * @slot: slot to be enabled
+ * @bridge: true if enable is for the whole bridge (not a single slot)
  *
  * This function should be called per *physical slot*,
  * not per each slot object in ACPI namespace.
  */
-static void enable_slot(struct acpiphp_slot *slot)
+static void enable_slot(struct acpiphp_slot *slot, bool bridge)
 {
         struct pci_dev *dev;
         struct pci_bus *bus = slot->bus;
         struct acpiphp_func *func;
 
-        if (bus->self && hotplug_is_native(bus->self)) {
+        if (bridge && bus->self && hotplug_is_native(bus->self)) {
                 /*
                  * If native hotplug is used, it will take care of hotplug
                  * slot management and resource allocation for hotplug
@@ -701,7 +702,7 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge)
                                         trim_stale_devices(dev);
 
                         /* configure all functions */
-                        enable_slot(slot);
+                        enable_slot(slot, true);
                 } else {
                         disable_slot(slot);
                 }
@@ -785,7 +786,7 @@ static void hotplug_event(u32 type, struct acpiphp_context *context)
                 if (bridge)
                         acpiphp_check_bridge(bridge);
                 else if (!(slot->flags & SLOT_IS_GOING_AWAY))
-                        enable_slot(slot);
+                        enable_slot(slot, false);
 
                 break;
 
@@ -973,7 +974,7 @@ int acpiphp_enable_slot(struct acpiphp_slot *slot)
 
         /* configure all functions */
         if (!(slot->flags & SLOT_ENABLED))
-                enable_slot(slot);
+                enable_slot(slot, false);
 
         pci_unlock_rescan_remove();
         return 0;
diff --git a/drivers/pinctrl/intel/pinctrl-cannonlake.c b/drivers/pinctrl/intel/pinctrl-cannonlake.c
index 8d48371caaa2..e7f45d96b0cb 100644
--- a/drivers/pinctrl/intel/pinctrl-cannonlake.c
+++ b/drivers/pinctrl/intel/pinctrl-cannonlake.c
@@ -15,10 +15,11 @@
 
 #include "pinctrl-intel.h"
 
-#define CNL_PAD_OWN     0x020
-#define CNL_PADCFGLOCK  0x080
-#define CNL_HOSTSW_OWN  0x0b0
-#define CNL_GPI_IE      0x120
+#define CNL_PAD_OWN             0x020
+#define CNL_PADCFGLOCK          0x080
+#define CNL_LP_HOSTSW_OWN       0x0b0
+#define CNL_H_HOSTSW_OWN        0x0c0
+#define CNL_GPI_IE              0x120
 
 #define CNL_GPP(r, s, e, g)                             \
         {                                               \
@@ -30,12 +31,12 @@
 
 #define CNL_NO_GPIO     -1
 
-#define CNL_COMMUNITY(b, s, e, g)                       \
+#define CNL_COMMUNITY(b, s, e, o, g)                    \
         {                                               \
                 .barno = (b),                           \
                 .padown_offset = CNL_PAD_OWN,           \
                 .padcfglock_offset = CNL_PADCFGLOCK,    \
-                .hostown_offset = CNL_HOSTSW_OWN,       \
+                .hostown_offset = (o),                  \
                 .ie_offset = CNL_GPI_IE,                \
                 .pin_base = (s),                        \
                 .npins = ((e) - (s) + 1),               \
@@ -43,6 +44,12 @@
                 .ngpps = ARRAY_SIZE(g),                 \
         }
 
+#define CNLLP_COMMUNITY(b, s, e, g)                     \
+        CNL_COMMUNITY(b, s, e, CNL_LP_HOSTSW_OWN, g)
+
+#define CNLH_COMMUNITY(b, s, e, g)                      \
+        CNL_COMMUNITY(b, s, e, CNL_H_HOSTSW_OWN, g)
+
 /* Cannon Lake-H */
 static const struct pinctrl_pin_desc cnlh_pins[] = {
         /* GPP_A */
@@ -442,10 +449,10 @@ static const struct intel_function cnlh_functions[] = {
 };
 
 static const struct intel_community cnlh_communities[] = {
-        CNL_COMMUNITY(0, 0, 50, cnlh_community0_gpps),
-        CNL_COMMUNITY(1, 51, 154, cnlh_community1_gpps),
-        CNL_COMMUNITY(2, 155, 248, cnlh_community3_gpps),
-        CNL_COMMUNITY(3, 249, 298, cnlh_community4_gpps),
+        CNLH_COMMUNITY(0, 0, 50, cnlh_community0_gpps),
+        CNLH_COMMUNITY(1, 51, 154, cnlh_community1_gpps),
+        CNLH_COMMUNITY(2, 155, 248, cnlh_community3_gpps),
+        CNLH_COMMUNITY(3, 249, 298, cnlh_community4_gpps),
 };
 
 static const struct intel_pinctrl_soc_data cnlh_soc_data = {
@@ -803,9 +810,9 @@ static const struct intel_padgroup cnllp_community4_gpps[] = {
 };
 
 static const struct intel_community cnllp_communities[] = {
-        CNL_COMMUNITY(0, 0, 67, cnllp_community0_gpps),
-        CNL_COMMUNITY(1, 68, 180, cnllp_community1_gpps),
-        CNL_COMMUNITY(2, 181, 243, cnllp_community4_gpps),
+        CNLLP_COMMUNITY(0, 0, 67, cnllp_community0_gpps),
+        CNLLP_COMMUNITY(1, 68, 180, cnllp_community1_gpps),
+        CNLLP_COMMUNITY(2, 181, 243, cnllp_community4_gpps),
 };
 
 static const struct intel_pinctrl_soc_data cnllp_soc_data = {
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index ec8dafc94694..1ea3438ea67e 100644
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -887,36 +887,6 @@ static const struct gpio_chip intel_gpio_chip = {
         .set_config = gpiochip_generic_config,
 };
 
-static int intel_gpio_irq_reqres(struct irq_data *d)
-{
-        struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct intel_pinctrl *pctrl = gpiochip_get_data(gc);
-        int pin;
-        int ret;
-
-        pin = intel_gpio_to_pin(pctrl, irqd_to_hwirq(d), NULL, NULL);
-        if (pin >= 0) {
-                ret = gpiochip_lock_as_irq(gc, pin);
-                if (ret) {
-                        dev_err(pctrl->dev, "unable to lock HW IRQ %d for IRQ\n",
-                                pin);
-                        return ret;
-                }
-        }
-        return 0;
-}
-
-static void intel_gpio_irq_relres(struct irq_data *d)
-{
-        struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-        struct intel_pinctrl *pctrl = gpiochip_get_data(gc);
-        int pin;
-
-        pin = intel_gpio_to_pin(pctrl, irqd_to_hwirq(d), NULL, NULL);
-        if (pin >= 0)
-                gpiochip_unlock_as_irq(gc, pin);
-}
-
 static void intel_gpio_irq_ack(struct irq_data *d)
 {
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
@@ -1132,8 +1102,6 @@ static irqreturn_t intel_gpio_irq(int irq, void *data)
 
 static struct irq_chip intel_gpio_irqchip = {
         .name = "intel-gpio",
-        .irq_request_resources = intel_gpio_irq_reqres,
-        .irq_release_resources = intel_gpio_irq_relres,
         .irq_enable = intel_gpio_irq_enable,
         .irq_ack = intel_gpio_irq_ack,
         .irq_mask = intel_gpio_irq_mask,
diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index 41ccc759b8b8..1425c2874d40 100644
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -348,21 +348,12 @@ static void amd_gpio_irq_enable(struct irq_data *d)
         unsigned long flags;
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
         struct amd_gpio *gpio_dev = gpiochip_get_data(gc);
-        u32 mask = BIT(INTERRUPT_ENABLE_OFF) | BIT(INTERRUPT_MASK_OFF);
 
         raw_spin_lock_irqsave(&gpio_dev->lock, flags);
         pin_reg = readl(gpio_dev->base + (d->hwirq)*4);
         pin_reg |= BIT(INTERRUPT_ENABLE_OFF);
         pin_reg |= BIT(INTERRUPT_MASK_OFF);
         writel(pin_reg, gpio_dev->base + (d->hwirq)*4);
-        /*
-         * When debounce logic is enabled it takes ~900 us before interrupts
-         * can be enabled.  During this "debounce warm up" period the
-         * "INTERRUPT_ENABLE" bit will read as 0. Poll the bit here until it
-         * reads back as 1, signaling that interrupts are now enabled.
-         */
-        while ((readl(gpio_dev->base + (d->hwirq)*4) & mask) != mask)
-                continue;
         raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);
 }
 
@@ -426,7 +417,7 @@ static void amd_gpio_irq_eoi(struct irq_data *d)
 static int amd_gpio_irq_set_type(struct irq_data *d, unsigned int type)
 {
         int ret = 0;
-        u32 pin_reg;
+        u32 pin_reg, pin_reg_irq_en, mask;
         unsigned long flags, irq_flags;
         struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
         struct amd_gpio *gpio_dev = gpiochip_get_data(gc);
@@ -495,6 +486,28 @@ static int amd_gpio_irq_set_type(struct irq_data *d, unsigned int type)
         }
 
         pin_reg |= CLR_INTR_STAT << INTERRUPT_STS_OFF;
+        /*
+         * If WAKE_INT_MASTER_REG.MaskStsEn is set, a software write to the
+         * debounce registers of any GPIO will block wake/interrupt status
+         * generation for *all* GPIOs for a lenght of time that depends on
+         * WAKE_INT_MASTER_REG.MaskStsLength[11:0].  During this period the
+         * INTERRUPT_ENABLE bit will read as 0.
+         *
+         * We temporarily enable irq for the GPIO whose configuration is
+         * changing, and then wait for it to read back as 1 to know when
+         * debounce has settled and then disable the irq again.
+         * We do this polling with the spinlock held to ensure other GPIO
+         * access routines do not read an incorrect value for the irq enable
+         * bit of other GPIOs.  We keep the GPIO masked while polling to avoid
+         * spurious irqs, and disable the irq again after polling.
+         */
+        mask = BIT(INTERRUPT_ENABLE_OFF);
+        pin_reg_irq_en = pin_reg;
+        pin_reg_irq_en |= mask;
+        pin_reg_irq_en &= ~BIT(INTERRUPT_MASK_OFF);
+        writel(pin_reg_irq_en, gpio_dev->base + (d->hwirq)*4);
+        while ((readl(gpio_dev->base + (d->hwirq)*4) & mask) != mask)
+                continue;
         writel(pin_reg, gpio_dev->base + (d->hwirq)*4);
         raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);
 
diff --git a/drivers/regulator/bd71837-regulator.c b/drivers/regulator/bd71837-regulator.c
index 0f8ac8dec3e1..a1bd8aaf4d98 100644
--- a/drivers/regulator/bd71837-regulator.c
+++ b/drivers/regulator/bd71837-regulator.c
@@ -569,6 +569,25 @@ static int bd71837_probe(struct platform_device *pdev)
                         BD71837_REG_REGLOCK);
         }
 
+        /*
+         * There is a HW quirk in BD71837. The shutdown sequence timings for
+         * bucks/LDOs which are controlled via register interface are changed.
+         * At PMIC poweroff the voltage for BUCK6/7 is cut immediately at the
+         * beginning of shut-down sequence. As bucks 6 and 7 are parent
+         * supplies for LDO5 and LDO6 - this causes LDO5/6 voltage
+         * monitoring to errorneously detect under voltage and force PMIC to
+         * emergency state instead of poweroff. In order to avoid this we
+         * disable voltage monitoring for LDO5 and LDO6
+         */
+        err = regmap_update_bits(pmic->mfd->regmap, BD718XX_REG_MVRFLTMASK2,
+                                 BD718XX_LDO5_VRMON80 | BD718XX_LDO6_VRMON80,
+                                 BD718XX_LDO5_VRMON80 | BD718XX_LDO6_VRMON80);
+        if (err) {
+                dev_err(&pmic->pdev->dev,
+                        "Failed to disable voltage monitoring\n");
+                goto err;
+        }
+
         for (i = 0; i < ARRAY_SIZE(pmic_regulator_inits); i++) {
 
                 struct regulator_desc *desc;
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index bb1324f93143..9577d8941846 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3161,7 +3161,7 @@ static inline int regulator_suspend_toggle(struct regulator_dev *rdev,
         if (!rstate->changeable)
                 return -EPERM;
 
-        rstate->enabled = en;
+        rstate->enabled = (en) ? ENABLE_IN_SUSPEND : DISABLE_IN_SUSPEND;
 
         return 0;
 }
@@ -4395,13 +4395,13 @@ regulator_register(const struct regulator_desc *regulator_desc,
             !rdev->desc->fixed_uV)
                 rdev->is_switch = true;
 
+        dev_set_drvdata(&rdev->dev, rdev);
         ret = device_register(&rdev->dev);
         if (ret != 0) {
                 put_device(&rdev->dev);
                 goto unset_supplies;
         }
 
-        dev_set_drvdata(&rdev->dev, rdev);
         rdev_init_debugfs(rdev);
 
         /* try to resolve regulators supply since a new one was registered */
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 638f17d4c848..210fc20f7de7 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -213,8 +213,6 @@ static void of_get_regulation_constraints(struct device_node *np,
                 else if (of_property_read_bool(suspend_np,
                                         "regulator-off-in-suspend"))
                         suspend_state->enabled = DISABLE_IN_SUSPEND;
-                else
-                        suspend_state->enabled = DO_NOTHING_IN_SUSPEND;
 
                 if (!of_property_read_u32(np, "regulator-suspend-min-microvolt",
                                           &pval))
diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c
index ecb22749df0b..8cc015183043 100644
--- a/drivers/soc/fsl/qbman/qman.c
+++ b/drivers/soc/fsl/qbman/qman.c
@@ -2729,6 +2729,9 @@ static int qman_alloc_range(struct gen_pool *p, u32 *result, u32 cnt)
 {
         unsigned long addr;
 
+        if (!p)
+                return -ENODEV;
+
         addr = gen_pool_alloc(p, cnt);
         if (!addr)
                 return -ENOMEM;
diff --git a/drivers/soc/fsl/qe/ucc.c b/drivers/soc/fsl/qe/ucc.c
index c646d8713861..681f7d4b7724 100644
--- a/drivers/soc/fsl/qe/ucc.c
+++ b/drivers/soc/fsl/qe/ucc.c
@@ -626,7 +626,7 @@ static u32 ucc_get_tdm_sync_shift(enum comm_dir mode, u32 tdm_num)
 {
         u32 shift;
 
-        shift = (mode == COMM_DIR_RX) ? RX_SYNC_SHIFT_BASE : RX_SYNC_SHIFT_BASE;
+        shift = (mode == COMM_DIR_RX) ? RX_SYNC_SHIFT_BASE : TX_SYNC_SHIFT_BASE;
         shift -= tdm_num * 2;
 
         return shift;
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index 0626e6e3ea0c..421bfc7dda67 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -300,8 +300,8 @@ static int spi_gpio_request(struct device *dev,
                 *mflags |= SPI_MASTER_NO_RX;
 
         spi_gpio->sck = devm_gpiod_get(dev, "sck", GPIOD_OUT_LOW);
-        if (IS_ERR(spi_gpio->mosi))
-                return PTR_ERR(spi_gpio->mosi);
+        if (IS_ERR(spi_gpio->sck))
+                return PTR_ERR(spi_gpio->sck);
 
         for (i = 0; i < num_chipselects; i++) {
                 spi_gpio->cs_gpios[i] = devm_gpiod_get_index(dev, "cs",
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 95dc4d78618d..b37de1d991d6 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -598,11 +598,13 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx,
 
         ret = wait_event_interruptible_timeout(rspi->wait,
                                                rspi->dma_callbacked, HZ);
-        if (ret > 0 && rspi->dma_callbacked)
+        if (ret > 0 && rspi->dma_callbacked) {
                 ret = 0;
-        else if (!ret) {
-                dev_err(&rspi->master->dev, "DMA timeout\n");
-                ret = -ETIMEDOUT;
+        } else {
+                if (!ret) {
+                        dev_err(&rspi->master->dev, "DMA timeout\n");
+                        ret = -ETIMEDOUT;
+                }
                 if (tx)
                         dmaengine_terminate_all(rspi->master->dma_tx);
                 if (rx)
@@ -1350,12 +1352,36 @@ static const struct platform_device_id spi_driver_ids[] = {
 
 MODULE_DEVICE_TABLE(platform, spi_driver_ids);
 
+#ifdef CONFIG_PM_SLEEP
+static int rspi_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct rspi_data *rspi = platform_get_drvdata(pdev);
+
+        return spi_master_suspend(rspi->master);
+}
+
+static int rspi_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct rspi_data *rspi = platform_get_drvdata(pdev);
+
+        return spi_master_resume(rspi->master);
+}
+
+static SIMPLE_DEV_PM_OPS(rspi_pm_ops, rspi_suspend, rspi_resume);
+#define DEV_PM_OPS      &rspi_pm_ops
+#else
+#define DEV_PM_OPS      NULL
+#endif /* CONFIG_PM_SLEEP */
+
 static struct platform_driver rspi_driver = {
         .probe =        rspi_probe,
         .remove =       rspi_remove,
         .id_table =     spi_driver_ids,
         .driver         = {
                 .name = "renesas_spi",
+                .pm = DEV_PM_OPS,
                 .of_match_table = of_match_ptr(rspi_of_match),
         },
 };
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 539d6d1a277a..101cd6aae2ea 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -397,7 +397,8 @@ static void sh_msiof_spi_set_mode_regs(struct sh_msiof_spi_priv *p,
 
 static void sh_msiof_reset_str(struct sh_msiof_spi_priv *p)
 {
-        sh_msiof_write(p, STR, sh_msiof_read(p, STR));
+        sh_msiof_write(p, STR,
+                       sh_msiof_read(p, STR) & ~(STR_TDREQ | STR_RDREQ));
 }
 
 static void sh_msiof_spi_write_fifo_8(struct sh_msiof_spi_priv *p,
@@ -1426,12 +1427,37 @@ static const struct platform_device_id spi_driver_ids[] = {
 };
 MODULE_DEVICE_TABLE(platform, spi_driver_ids);
 
+#ifdef CONFIG_PM_SLEEP
+static int sh_msiof_spi_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct sh_msiof_spi_priv *p = platform_get_drvdata(pdev);
+
+        return spi_master_suspend(p->master);
+}
+
+static int sh_msiof_spi_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct sh_msiof_spi_priv *p = platform_get_drvdata(pdev);
+
+        return spi_master_resume(p->master);
+}
+
+static SIMPLE_DEV_PM_OPS(sh_msiof_spi_pm_ops, sh_msiof_spi_suspend,
+                         sh_msiof_spi_resume);
+#define DEV_PM_OPS      &sh_msiof_spi_pm_ops
+#else
+#define DEV_PM_OPS      NULL
+#endif /* CONFIG_PM_SLEEP */
+
 static struct platform_driver sh_msiof_spi_drv = {
         .probe          = sh_msiof_spi_probe,
         .remove         = sh_msiof_spi_remove,
         .id_table       = spi_driver_ids,
         .driver         = {
                 .name           = "spi_sh_msiof",
+                .pm             = DEV_PM_OPS,
                 .of_match_table = of_match_ptr(sh_msiof_match),
         },
 };
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index 6f7b946b5ced..1427f343b39a 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -1063,6 +1063,24 @@ static int tegra_slink_probe(struct platform_device *pdev)
                 goto exit_free_master;
         }
 
+        /* disabled clock may cause interrupt storm upon request */
+        tspi->clk = devm_clk_get(&pdev->dev, NULL);
+        if (IS_ERR(tspi->clk)) {
+                ret = PTR_ERR(tspi->clk);
+                dev_err(&pdev->dev, "Can not get clock %d\n", ret);
+                goto exit_free_master;
+        }
+        ret = clk_prepare(tspi->clk);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Clock prepare failed %d\n", ret);
+                goto exit_free_master;
+        }
+        ret = clk_enable(tspi->clk);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Clock enable failed %d\n", ret);
+                goto exit_free_master;
+        }
+
         spi_irq = platform_get_irq(pdev, 0);
         tspi->irq = spi_irq;
         ret = request_threaded_irq(tspi->irq, tegra_slink_isr,
@@ -1071,14 +1089,7 @@ static int tegra_slink_probe(struct platform_device *pdev)
         if (ret < 0) {
                 dev_err(&pdev->dev, "Failed to register ISR for IRQ %d\n",
                                         tspi->irq);
-                goto exit_free_master;
-        }
-
-        tspi->clk = devm_clk_get(&pdev->dev, NULL);
-        if (IS_ERR(tspi->clk)) {
-                dev_err(&pdev->dev, "can not get clock\n");
-                ret = PTR_ERR(tspi->clk);
-                goto exit_free_irq;
+                goto exit_clk_disable;
         }
 
         tspi->rst = devm_reset_control_get_exclusive(&pdev->dev, "spi");
@@ -1138,6 +1149,8 @@ exit_rx_dma_free:
         tegra_slink_deinit_dma_param(tspi, true);
 exit_free_irq:
         free_irq(spi_irq, tspi);
+exit_clk_disable:
+        clk_disable(tspi->clk);
 exit_free_master:
         spi_master_put(master);
         return ret;
@@ -1150,6 +1163,8 @@ static int tegra_slink_remove(struct platform_device *pdev)
 
         free_irq(tspi->irq, tspi);
 
+        clk_disable(tspi->clk);
+
         if (tspi->tx_dma_chan)
                 tegra_slink_deinit_dma_param(tspi, false);
 
diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index 3946649b85c8..ba906876cc45 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -42,6 +42,7 @@ struct bmp_dib_header {
         u32 colors_important;
 } __packed;
 
+static bool use_bgrt = true;
 static bool request_mem_succeeded = false;
 static u64 mem_flags = EFI_MEMORY_WC | EFI_MEMORY_UC;
 
@@ -160,6 +161,9 @@ static void efifb_show_boot_graphics(struct fb_info *info)
         void *bgrt_image = NULL;
         u8 *dst = info->screen_base;
 
+        if (!use_bgrt)
+                return;
+
         if (!bgrt_tab.image_address) {
                 pr_info("efifb: No BGRT, not showing boot graphics\n");
                 return;
@@ -290,6 +294,8 @@ static int efifb_setup(char *options)
                                 screen_info.lfb_width = simple_strtoul(this_opt+6, NULL, 0);
                         else if (!strcmp(this_opt, "nowc"))
                                 mem_flags &= ~EFI_MEMORY_WC;
+                        else if (!strcmp(this_opt, "nobgrt"))
+                                use_bgrt = false;
                 }
         }
 
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c b/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
index ef69273074ba..a3edb20ea4c3 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
@@ -496,6 +496,9 @@ static int omapfb_memory_read(struct fb_info *fbi,
         if (!access_ok(VERIFY_WRITE, mr->buffer, mr->buffer_size))
                 return -EFAULT;
 
+        if (mr->w > 4096 || mr->h > 4096)
+                return -EINVAL;
+
         if (mr->w * mr->h * 3 > mr->buffer_size)
                 return -EINVAL;
 
@@ -509,7 +512,7 @@ static int omapfb_memory_read(struct fb_info *fbi,
                         mr->x, mr->y, mr->w, mr->h);
 
         if (r > 0) {
-                if (copy_to_user(mr->buffer, buf, mr->buffer_size))
+                if (copy_to_user(mr->buffer, buf, r))
                         r = -EFAULT;
         }
 
diff --git a/drivers/video/fbdev/pxa168fb.c b/drivers/video/fbdev/pxa168fb.c
index def3a501acd6..d059d04c63ac 100644
--- a/drivers/video/fbdev/pxa168fb.c
+++ b/drivers/video/fbdev/pxa168fb.c
@@ -712,7 +712,7 @@ static int pxa168fb_probe(struct platform_device *pdev)
         /*
          * enable controller clock
          */
-        clk_enable(fbi->clk);
+        clk_prepare_enable(fbi->clk);
 
         pxa168fb_set_par(info);
 
@@ -767,7 +767,7 @@ static int pxa168fb_probe(struct platform_device *pdev)
 failed_free_cmap:
         fb_dealloc_cmap(&info->cmap);
 failed_free_clk:
-        clk_disable(fbi->clk);
+        clk_disable_unprepare(fbi->clk);
 failed_free_fbmem:
         dma_free_coherent(fbi->dev, info->fix.smem_len,
                         info->screen_base, fbi->fb_start_dma);
@@ -807,7 +807,7 @@ static int pxa168fb_remove(struct platform_device *pdev)
         dma_free_wc(fbi->dev, PAGE_ALIGN(info->fix.smem_len),
                     info->screen_base, info->fix.smem_start);
 
-        clk_disable(fbi->clk);
+        clk_disable_unprepare(fbi->clk);
 
         framebuffer_release(info);
 
diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c
index 045e8afe398b..9e88e3f594c2 100644
--- a/drivers/video/fbdev/stifb.c
+++ b/drivers/video/fbdev/stifb.c
@@ -1157,7 +1157,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
                         dev_name);
                    goto out_err0;
                 }
-                /* fall though */
+                /* fall through */
         case S9000_ID_ARTIST:
         case S9000_ID_HCRX:
         case S9000_ID_TIMBER:
diff --git a/fs/dax.c b/fs/dax.c
index f32d7125ad0f..4becbf168b7f 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -447,6 +447,7 @@ bool dax_lock_mapping_entry(struct page *page)
                         xa_unlock_irq(&mapping->i_pages);
                         break;
                 } else if (IS_ERR(entry)) {
+                        xa_unlock_irq(&mapping->i_pages);
                         WARN_ON_ONCE(PTR_ERR(entry) != -EAGAIN);
                         continue;
                 }
@@ -1120,21 +1121,12 @@ static vm_fault_t dax_load_hole(struct address_space *mapping, void *entry,
 {
         struct inode *inode = mapping->host;
         unsigned long vaddr = vmf->address;
-        vm_fault_t ret = VM_FAULT_NOPAGE;
-        struct page *zero_page;
-        pfn_t pfn;
-
-        zero_page = ZERO_PAGE(0);
-        if (unlikely(!zero_page)) {
-                ret = VM_FAULT_OOM;
-                goto out;
-        }
+        pfn_t pfn = pfn_to_pfn_t(my_zero_pfn(vaddr));
+        vm_fault_t ret;
 
-        pfn = page_to_pfn_t(zero_page);
         dax_insert_mapping_entry(mapping, vmf, entry, pfn, RADIX_DAX_ZERO_PAGE,
                         false);
         ret = vmf_insert_mixed(vmf->vma, vaddr, pfn);
-out:
         trace_dax_load_hole(inode, vmf, ret);
         return ret;
 }
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 7f7ee18fe179..e4bb9386c045 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1448,6 +1448,7 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
         }
         inode->i_blocks = le32_to_cpu(raw_inode->i_blocks);
         ei->i_flags = le32_to_cpu(raw_inode->i_flags);
+        ext2_set_inode_flags(inode);
         ei->i_faddr = le32_to_cpu(raw_inode->i_faddr);
         ei->i_frag_no = raw_inode->i_frag;
         ei->i_frag_size = raw_inode->i_fsize;
@@ -1517,7 +1518,6 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
                            new_decode_dev(le32_to_cpu(raw_inode->i_block[1])));
         }
         brelse (bh);
-        ext2_set_inode_flags(inode);
         unlock_new_inode(inode);
         return inode;
         
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index bbd1e357c23d..f4fd2e72add4 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -898,8 +898,22 @@ static struct platform_driver ramoops_driver = {
         },
 };
 
-static void ramoops_register_dummy(void)
+static inline void ramoops_unregister_dummy(void)
 {
+        platform_device_unregister(dummy);
+        dummy = NULL;
+
+        kfree(dummy_data);
+        dummy_data = NULL;
+}
+
+static void __init ramoops_register_dummy(void)
+{
+        /*
+         * Prepare a dummy platform data structure to carry the module
+         * parameters. If mem_size isn't set, then there are no module
+         * parameters, and we can skip this.
+         */
         if (!mem_size)
                 return;
 
@@ -932,21 +946,28 @@ static void ramoops_register_dummy(void)
         if (IS_ERR(dummy)) {
                 pr_info("could not create platform device: %ld\n",
                         PTR_ERR(dummy));
+                dummy = NULL;
+                ramoops_unregister_dummy();
         }
 }
 
 static int __init ramoops_init(void)
 {
+        int ret;
+
         ramoops_register_dummy();
-        return platform_driver_register(&ramoops_driver);
+        ret = platform_driver_register(&ramoops_driver);
+        if (ret != 0)
+                ramoops_unregister_dummy();
+
+        return ret;
 }
 late_initcall(ramoops_init);
 
 static void __exit ramoops_exit(void)
 {
         platform_driver_unregister(&ramoops_driver);
-        platform_device_unregister(dummy);
-        kfree(dummy_data);
+        ramoops_unregister_dummy();
 }
 module_exit(ramoops_exit);
 
diff --git a/fs/xattr.c b/fs/xattr.c
index daa732550088..0d6a6a4af861 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -948,17 +948,19 @@ ssize_t simple_xattr_list(struct inode *inode, struct simple_xattrs *xattrs,
         int err = 0;
 
 #ifdef CONFIG_FS_POSIX_ACL
-        if (inode->i_acl) {
-                err = xattr_list_one(&buffer, &remaining_size,
-                                     XATTR_NAME_POSIX_ACL_ACCESS);
-                if (err)
-                        return err;
-        }
-        if (inode->i_default_acl) {
-                err = xattr_list_one(&buffer, &remaining_size,
-                                     XATTR_NAME_POSIX_ACL_DEFAULT);
-                if (err)
-                        return err;
+        if (IS_POSIXACL(inode)) {
+                if (inode->i_acl) {
+                        err = xattr_list_one(&buffer, &remaining_size,
+                                             XATTR_NAME_POSIX_ACL_ACCESS);
+                        if (err)
+                                return err;
+                }
+                if (inode->i_default_acl) {
+                        err = xattr_list_one(&buffer, &remaining_size,
+                                             XATTR_NAME_POSIX_ACL_DEFAULT);
+                        if (err)
+                                return err;
+                }
         }
 #endif
 
diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h
index 582a0ec0aa70..777814755fa6 100644
--- a/include/drm/drm_panel.h
+++ b/include/drm/drm_panel.h
@@ -89,7 +89,6 @@ struct drm_panel {
         struct drm_device *drm;
         struct drm_connector *connector;
         struct device *dev;
-        struct device_link *link;
 
         const struct drm_panel_funcs *funcs;
 
diff --git a/include/linux/mfd/rohm-bd718x7.h b/include/linux/mfd/rohm-bd718x7.h
index a528747f8aed..e8338e5dc10b 100644
--- a/include/linux/mfd/rohm-bd718x7.h
+++ b/include/linux/mfd/rohm-bd718x7.h
@@ -78,9 +78,9 @@ enum {
         BD71837_REG_TRANS_COND0        = 0x1F,
         BD71837_REG_TRANS_COND1        = 0x20,
         BD71837_REG_VRFAULTEN          = 0x21,
-        BD71837_REG_MVRFLTMASK0        = 0x22,
-        BD71837_REG_MVRFLTMASK1        = 0x23,
-        BD71837_REG_MVRFLTMASK2        = 0x24,
+        BD718XX_REG_MVRFLTMASK0        = 0x22,
+        BD718XX_REG_MVRFLTMASK1        = 0x23,
+        BD718XX_REG_MVRFLTMASK2        = 0x24,
         BD71837_REG_RCVCFG             = 0x25,
         BD71837_REG_RCVNUM             = 0x26,
         BD71837_REG_PWRONCONFIG0       = 0x27,
@@ -159,6 +159,33 @@ enum {
 #define BUCK8_MASK              0x3F
 #define BUCK8_DEFAULT           0x1E
 
+/* BD718XX Voltage monitoring masks */
+#define BD718XX_BUCK1_VRMON80           0x1
+#define BD718XX_BUCK1_VRMON130          0x2
+#define BD718XX_BUCK2_VRMON80           0x4
+#define BD718XX_BUCK2_VRMON130          0x8
+#define BD718XX_1ST_NODVS_BUCK_VRMON80  0x1
+#define BD718XX_1ST_NODVS_BUCK_VRMON130 0x2
+#define BD718XX_2ND_NODVS_BUCK_VRMON80  0x4
+#define BD718XX_2ND_NODVS_BUCK_VRMON130 0x8
+#define BD718XX_3RD_NODVS_BUCK_VRMON80  0x10
+#define BD718XX_3RD_NODVS_BUCK_VRMON130 0x20
+#define BD718XX_4TH_NODVS_BUCK_VRMON80  0x40
+#define BD718XX_4TH_NODVS_BUCK_VRMON130 0x80
+#define BD718XX_LDO1_VRMON80            0x1
+#define BD718XX_LDO2_VRMON80            0x2
+#define BD718XX_LDO3_VRMON80            0x4
+#define BD718XX_LDO4_VRMON80            0x8
+#define BD718XX_LDO5_VRMON80            0x10
+#define BD718XX_LDO6_VRMON80            0x20
+
+/* BD71837 specific voltage monitoring masks */
+#define BD71837_BUCK3_VRMON80           0x10
+#define BD71837_BUCK3_VRMON130          0x20
+#define BD71837_BUCK4_VRMON80           0x40
+#define BD71837_BUCK4_VRMON130          0x80
+#define BD71837_LDO7_VRMON80            0x40
+
 /* BD71837_REG_IRQ bits */
 #define IRQ_SWRST               0x40
 #define IRQ_PWRON_S             0x20
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 3468703d663a..a459a5e973a7 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -48,9 +48,9 @@ struct regulator;
  * DISABLE_IN_SUSPEND   - turn off regulator in suspend states
  * ENABLE_IN_SUSPEND    - keep regulator on in suspend states
  */
-#define DO_NOTHING_IN_SUSPEND   (-1)
-#define DISABLE_IN_SUSPEND      0
-#define ENABLE_IN_SUSPEND       1
+#define DO_NOTHING_IN_SUSPEND   0
+#define DISABLE_IN_SUSPEND      1
+#define ENABLE_IN_SUSPEND       2
 
 /* Regulator active discharge flags */
 enum regulator_active_discharge {
diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h
index b2bd4b4127c4..69ee30456864 100644
--- a/include/linux/spi/spi-mem.h
+++ b/include/linux/spi/spi-mem.h
@@ -81,8 +81,10 @@ enum spi_mem_data_dir {
  * @dummy.buswidth: number of IO lanes used to transmit the dummy bytes
  * @data.buswidth: number of IO lanes used to send/receive the data
  * @data.dir: direction of the transfer
- * @data.buf.in: input buffer
- * @data.buf.out: output buffer
+ * @data.nbytes: number of data bytes to send/receive. Can be zero if the
+ *               operation does not involve transferring data
+ * @data.buf.in: input buffer (must be DMA-able)
+ * @data.buf.out: output buffer (must be DMA-able)
  */
 struct spi_mem_op {
         struct {
@@ -105,7 +107,6 @@ struct spi_mem_op {
                 u8 buswidth;
                 enum spi_mem_data_dir dir;
                 unsigned int nbytes;
-                /* buf.{in,out} must be DMA-able. */
                 union {
                         void *in;
                         const void *out;
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 409c845d4cd3..422b1c01ee0d 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -172,7 +172,7 @@ size_t copy_from_iter_flushcache(void *addr, size_t bytes, struct iov_iter *i)
 static __always_inline __must_check
 size_t copy_to_iter_mcsafe(void *addr, size_t bytes, struct iov_iter *i)
 {
-        if (unlikely(!check_copy_size(addr, bytes, false)))
+        if (unlikely(!check_copy_size(addr, bytes, true)))
                 return 0;
         else
                 return _copy_to_iter_mcsafe(addr, bytes, i);
diff --git a/include/media/v4l2-fh.h b/include/media/v4l2-fh.h
index ea73fef8bdc0..8586cfb49828 100644
--- a/include/media/v4l2-fh.h
+++ b/include/media/v4l2-fh.h
@@ -38,10 +38,13 @@ struct v4l2_ctrl_handler;
  * @prio: priority of the file handler, as defined by &enum v4l2_priority
  *
  * @wait: event' s wait queue
+ * @subscribe_lock: serialise changes to the subscribed list; guarantee that
+ *                  the add and del event callbacks are orderly called
  * @subscribed: list of subscribed events
  * @available: list of events waiting to be dequeued
  * @navailable: number of available events at @available list
  * @sequence: event sequence number
+ *
  * @m2m_ctx: pointer to &struct v4l2_m2m_ctx
  */
 struct v4l2_fh {
@@ -52,6 +55,7 @@ struct v4l2_fh {
 
         /* Events */
         wait_queue_head_t       wait;
+        struct mutex            subscribe_lock;
         struct list_head        subscribed;
         struct list_head        available;
         unsigned int            navailable;
diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig
index 9bd54304446f..1b1d63b3634b 100644
--- a/kernel/dma/Kconfig
+++ b/kernel/dma/Kconfig
@@ -23,6 +23,9 @@ config ARCH_HAS_SYNC_DMA_FOR_CPU
         bool
         select NEED_DMA_MAP_STATE
 
+config ARCH_HAS_SYNC_DMA_FOR_CPU_ALL
+        bool
+
 config DMA_DIRECT_OPS
         bool
         depends on HAS_DMA
diff --git a/kernel/events/core.c b/kernel/events/core.c
index c80549bf82c6..dcb093e7b377 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3935,6 +3935,12 @@ int perf_event_read_local(struct perf_event *event, u64 *value,
                 goto out;
         }
 
+        /* If this is a pinned event it must be running on this CPU */
+        if (event->attr.pinned && event->oncpu != smp_processor_id()) {
+                ret = -EBUSY;
+                goto out;
+        }
+
         /*
          * If the event is currently on this CPU, its either a per-task event,
          * or local to this CPU. Furthermore it means its ACTIVE (otherwise
diff --git a/tools/testing/selftests/powerpc/alignment/Makefile b/tools/testing/selftests/powerpc/alignment/Makefile
index 93baacab7693..d056486f49de 100644
--- a/tools/testing/selftests/powerpc/alignment/Makefile
+++ b/tools/testing/selftests/powerpc/alignment/Makefile
@@ -1,5 +1,6 @@
 TEST_GEN_PROGS := copy_first_unaligned alignment_handler
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 $(TEST_GEN_PROGS): ../harness.c ../utils.c
diff --git a/tools/testing/selftests/powerpc/benchmarks/Makefile b/tools/testing/selftests/powerpc/benchmarks/Makefile
index b4d7432a0ecd..d40300a65b42 100644
--- a/tools/testing/selftests/powerpc/benchmarks/Makefile
+++ b/tools/testing/selftests/powerpc/benchmarks/Makefile
@@ -4,6 +4,7 @@ TEST_GEN_FILES := exec_target
 
 CFLAGS += -O2
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 $(TEST_GEN_PROGS): ../harness.c
diff --git a/tools/testing/selftests/powerpc/cache_shape/Makefile b/tools/testing/selftests/powerpc/cache_shape/Makefile
index 1be547434a49..ede4d3dae750 100644
--- a/tools/testing/selftests/powerpc/cache_shape/Makefile
+++ b/tools/testing/selftests/powerpc/cache_shape/Makefile
@@ -5,6 +5,7 @@ all: $(TEST_PROGS)
 
 $(TEST_PROGS): ../harness.c ../utils.c
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 clean:
diff --git a/tools/testing/selftests/powerpc/copyloops/Makefile b/tools/testing/selftests/powerpc/copyloops/Makefile
index 1cf89a34d97c..44574f3818b3 100644
--- a/tools/testing/selftests/powerpc/copyloops/Makefile
+++ b/tools/testing/selftests/powerpc/copyloops/Makefile
@@ -17,6 +17,7 @@ TEST_GEN_PROGS := copyuser_64_t0 copyuser_64_t1 copyuser_64_t2 \
 
 EXTRA_SOURCES := validate.c ../harness.c stubs.S
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 $(OUTPUT)/copyuser_64_t%:       copyuser_64.S $(EXTRA_SOURCES)
diff --git a/tools/testing/selftests/powerpc/dscr/Makefile b/tools/testing/selftests/powerpc/dscr/Makefile
index 55d7db7a616b..5df476364b4d 100644
--- a/tools/testing/selftests/powerpc/dscr/Makefile
+++ b/tools/testing/selftests/powerpc/dscr/Makefile
@@ -3,6 +3,7 @@ TEST_GEN_PROGS := dscr_default_test dscr_explicit_test dscr_user_test	\
               dscr_inherit_test dscr_inherit_exec_test dscr_sysfs_test  \
               dscr_sysfs_thread_test
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 $(OUTPUT)/dscr_default_test: LDLIBS += -lpthread
diff --git a/tools/testing/selftests/powerpc/math/Makefile b/tools/testing/selftests/powerpc/math/Makefile
index 0dd3a01fdab9..11a10d7a2bbd 100644
--- a/tools/testing/selftests/powerpc/math/Makefile
+++ b/tools/testing/selftests/powerpc/math/Makefile
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 TEST_GEN_PROGS := fpu_syscall fpu_preempt fpu_signal vmx_syscall vmx_preempt vmx_signal vsx_preempt
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 $(TEST_GEN_PROGS): ../harness.c
diff --git a/tools/testing/selftests/powerpc/mm/Makefile b/tools/testing/selftests/powerpc/mm/Makefile
index 8ebbe96d80a8..33ced6e0ad25 100644
--- a/tools/testing/selftests/powerpc/mm/Makefile
+++ b/tools/testing/selftests/powerpc/mm/Makefile
@@ -5,6 +5,7 @@ noarg:
 TEST_GEN_PROGS := hugetlb_vs_thp_test subpage_prot prot_sao segv_errors
 TEST_GEN_FILES := tempfile
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 $(TEST_GEN_PROGS): ../harness.c
diff --git a/tools/testing/selftests/powerpc/pmu/Makefile b/tools/testing/selftests/powerpc/pmu/Makefile
index 6e1629bf5b09..19046db995fe 100644
--- a/tools/testing/selftests/powerpc/pmu/Makefile
+++ b/tools/testing/selftests/powerpc/pmu/Makefile
@@ -5,6 +5,7 @@ noarg:
 TEST_GEN_PROGS := count_instructions l3_bank_test per_event_excludes
 EXTRA_SOURCES := ../harness.c event.c lib.c ../utils.c
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 all: $(TEST_GEN_PROGS) ebb
diff --git a/tools/testing/selftests/powerpc/pmu/ebb/Makefile b/tools/testing/selftests/powerpc/pmu/ebb/Makefile
index c4e64bc2e265..bd5dfa509272 100644
--- a/tools/testing/selftests/powerpc/pmu/ebb/Makefile
+++ b/tools/testing/selftests/powerpc/pmu/ebb/Makefile
@@ -17,6 +17,7 @@ TEST_GEN_PROGS := reg_access_test event_attributes_test cycles_test	\
          lost_exception_test no_handler_test                    \
          cycles_with_mmcr2_test
 
+top_srcdir = ../../../../../..
 include ../../../lib.mk
 
 $(TEST_GEN_PROGS): ../../harness.c ../../utils.c ../event.c ../lib.c \
diff --git a/tools/testing/selftests/powerpc/primitives/Makefile b/tools/testing/selftests/powerpc/primitives/Makefile
index 175366db7be8..ea2b7bd09e36 100644
--- a/tools/testing/selftests/powerpc/primitives/Makefile
+++ b/tools/testing/selftests/powerpc/primitives/Makefile
@@ -2,6 +2,7 @@ CFLAGS += -I$(CURDIR)
 
 TEST_GEN_PROGS := load_unaligned_zeropad
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 $(TEST_GEN_PROGS): ../harness.c
diff --git a/tools/testing/selftests/powerpc/ptrace/Makefile b/tools/testing/selftests/powerpc/ptrace/Makefile
index 28f5b781a553..923d531265f8 100644
--- a/tools/testing/selftests/powerpc/ptrace/Makefile
+++ b/tools/testing/selftests/powerpc/ptrace/Makefile
@@ -4,6 +4,7 @@ TEST_PROGS := ptrace-gpr ptrace-tm-gpr ptrace-tm-spd-gpr \
               ptrace-tm-spd-vsx ptrace-tm-spr ptrace-hwbreak ptrace-pkey core-pkey \
               perf-hwbreak
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 all: $(TEST_PROGS)
diff --git a/tools/testing/selftests/powerpc/signal/Makefile b/tools/testing/selftests/powerpc/signal/Makefile
index a7cbd5082e27..1fca25c6ace0 100644
--- a/tools/testing/selftests/powerpc/signal/Makefile
+++ b/tools/testing/selftests/powerpc/signal/Makefile
@@ -8,6 +8,7 @@ $(TEST_PROGS): ../harness.c ../utils.c signal.S
 CFLAGS += -maltivec
 signal_tm: CFLAGS += -mhtm
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 clean:
diff --git a/tools/testing/selftests/powerpc/stringloops/Makefile b/tools/testing/selftests/powerpc/stringloops/Makefile
index 10b35c87a4f4..7fc0623d85c3 100644
--- a/tools/testing/selftests/powerpc/stringloops/Makefile
+++ b/tools/testing/selftests/powerpc/stringloops/Makefile
@@ -29,6 +29,7 @@ endif
 
 ASFLAGS = $(CFLAGS)
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 $(TEST_GEN_PROGS): $(EXTRA_SOURCES)
diff --git a/tools/testing/selftests/powerpc/switch_endian/Makefile b/tools/testing/selftests/powerpc/switch_endian/Makefile
index 30b8ff8fb82e..fcd2dcb8972b 100644
--- a/tools/testing/selftests/powerpc/switch_endian/Makefile
+++ b/tools/testing/selftests/powerpc/switch_endian/Makefile
@@ -5,6 +5,7 @@ ASFLAGS += -O2 -Wall -g -nostdlib -m64
 
 EXTRA_CLEAN = $(OUTPUT)/*.o $(OUTPUT)/check-reversed.S
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 $(OUTPUT)/switch_endian_test: $(OUTPUT)/check-reversed.S
diff --git a/tools/testing/selftests/powerpc/syscalls/Makefile b/tools/testing/selftests/powerpc/syscalls/Makefile
index da22ca7c38c1..161b8846336f 100644
--- a/tools/testing/selftests/powerpc/syscalls/Makefile
+++ b/tools/testing/selftests/powerpc/syscalls/Makefile
@@ -2,6 +2,7 @@ TEST_GEN_PROGS := ipc_unmuxed
 
 CFLAGS += -I../../../../../usr/include
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 $(TEST_GEN_PROGS): ../harness.c
diff --git a/tools/testing/selftests/powerpc/tm/Makefile b/tools/testing/selftests/powerpc/tm/Makefile
index c0e45d2dde25..9fc2cf6fbc92 100644
--- a/tools/testing/selftests/powerpc/tm/Makefile
+++ b/tools/testing/selftests/powerpc/tm/Makefile
@@ -6,6 +6,7 @@ TEST_GEN_PROGS := tm-resched-dscr tm-syscall tm-signal-msr-resv tm-signal-stack
         tm-vmxcopy tm-fork tm-tar tm-tmspr tm-vmx-unavail tm-unavailable tm-trap \
         $(SIGNAL_CONTEXT_CHK_TESTS) tm-sigreturn
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 $(TEST_GEN_PROGS): ../harness.c ../utils.c
diff --git a/tools/testing/selftests/powerpc/vphn/Makefile b/tools/testing/selftests/powerpc/vphn/Makefile
index f8ced26748f8..fb82068c9fda 100644
--- a/tools/testing/selftests/powerpc/vphn/Makefile
+++ b/tools/testing/selftests/powerpc/vphn/Makefile
@@ -2,6 +2,7 @@ TEST_GEN_PROGS := test-vphn
 
 CFLAGS += -m64
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 $(TEST_GEN_PROGS): ../harness.c
diff --git a/tools/testing/selftests/rseq/param_test.c b/tools/testing/selftests/rseq/param_test.c
index 642d4e12abea..eec2663261f2 100644
--- a/tools/testing/selftests/rseq/param_test.c
+++ b/tools/testing/selftests/rseq/param_test.c
@@ -56,15 +56,13 @@ unsigned int yield_mod_cnt, nr_abort;
                         printf(fmt, ## __VA_ARGS__);    \
         } while (0)
 
-#if defined(__x86_64__) || defined(__i386__)
+#ifdef __i386__
 
 #define INJECT_ASM_REG  "eax"
 
 #define RSEQ_INJECT_CLOBBER \
         , INJECT_ASM_REG
 
-#ifdef __i386__
-
 #define RSEQ_INJECT_ASM(n) \
         "mov asm_loop_cnt_" #n ", %%" INJECT_ASM_REG "\n\t" \
         "test %%" INJECT_ASM_REG ",%%" INJECT_ASM_REG "\n\t" \
@@ -76,9 +74,16 @@ unsigned int yield_mod_cnt, nr_abort;
 
 #elif defined(__x86_64__)
 
+#define INJECT_ASM_REG_P        "rax"
+#define INJECT_ASM_REG          "eax"
+
+#define RSEQ_INJECT_CLOBBER \
+        , INJECT_ASM_REG_P \
+        , INJECT_ASM_REG
+
 #define RSEQ_INJECT_ASM(n) \
-        "lea asm_loop_cnt_" #n "(%%rip), %%" INJECT_ASM_REG "\n\t" \
-        "mov (%%" INJECT_ASM_REG "), %%" INJECT_ASM_REG "\n\t" \
+        "lea asm_loop_cnt_" #n "(%%rip), %%" INJECT_ASM_REG_P "\n\t" \
+        "mov (%%" INJECT_ASM_REG_P "), %%" INJECT_ASM_REG "\n\t" \
         "test %%" INJECT_ASM_REG ",%%" INJECT_ASM_REG "\n\t" \
         "jz 333f\n\t" \
         "222:\n\t" \
@@ -86,10 +91,6 @@ unsigned int yield_mod_cnt, nr_abort;
         "jnz 222b\n\t" \
         "333:\n\t"
 
-#else
-#error "Unsupported architecture"
-#endif
-
 #elif defined(__s390__)
 
 #define RSEQ_INJECT_INPUT \