676 files changed, 8542 insertions, 4340 deletions

diff --git a/.clang-format b/.clang-format
index 2ffd69afc1a8..196ca317bd1f 100644
--- a/.clang-format
+++ b/.clang-format
@@ -107,10 +107,13 @@ ForEachMacros:
   - 'css_for_each_descendant_post'
   - 'css_for_each_descendant_pre'
   - 'device_for_each_child_node'
+  - 'dma_fence_chain_for_each'
   - 'drm_atomic_crtc_for_each_plane'
   - 'drm_atomic_crtc_state_for_each_plane'
   - 'drm_atomic_crtc_state_for_each_plane_state'
   - 'drm_atomic_for_each_plane_damage'
+  - 'drm_client_for_each_connector_iter'
+  - 'drm_client_for_each_modeset'
   - 'drm_connector_for_each_possible_encoder'
   - 'drm_for_each_connector_iter'
   - 'drm_for_each_crtc'
@@ -126,6 +129,7 @@ ForEachMacros:
   - 'drm_mm_for_each_node_in_range'
   - 'drm_mm_for_each_node_safe'
   - 'flow_action_for_each'
+  - 'for_each_active_dev_scope'
   - 'for_each_active_drhd_unit'
   - 'for_each_active_iommu'
   - 'for_each_available_child_of_node'
@@ -153,6 +157,8 @@ ForEachMacros:
   - 'for_each_cpu_not'
   - 'for_each_cpu_wrap'
   - 'for_each_dev_addr'
+  - 'for_each_dev_scope'
+  - 'for_each_displayid_db'
   - 'for_each_dma_cap_mask'
   - 'for_each_dpcm_be'
   - 'for_each_dpcm_be_rollback'
@@ -169,6 +175,8 @@ ForEachMacros:
   - 'for_each_evictable_lru'
   - 'for_each_fib6_node_rt_rcu'
   - 'for_each_fib6_walker_rt'
+  - 'for_each_free_mem_pfn_range_in_zone'
+  - 'for_each_free_mem_pfn_range_in_zone_from'
   - 'for_each_free_mem_range'
   - 'for_each_free_mem_range_reverse'
   - 'for_each_func_rsrc'
@@ -178,6 +186,7 @@ ForEachMacros:
   - 'for_each_ip_tunnel_rcu'
   - 'for_each_irq_nr'
   - 'for_each_link_codecs'
+  - 'for_each_link_platforms'
   - 'for_each_lru'
   - 'for_each_matching_node'
   - 'for_each_matching_node_and_match'
@@ -302,7 +311,10 @@ ForEachMacros:
   - 'ide_port_for_each_present_dev'
   - 'idr_for_each_entry'
   - 'idr_for_each_entry_continue'
+  - 'idr_for_each_entry_continue_ul'
   - 'idr_for_each_entry_ul'
+  - 'in_dev_for_each_ifa_rcu'
+  - 'in_dev_for_each_ifa_rtnl'
   - 'inet_bind_bucket_for_each'
   - 'inet_lhash2_for_each_icsk_rcu'
   - 'key_for_each'
@@ -343,8 +355,6 @@ ForEachMacros:
   - 'media_device_for_each_intf'
   - 'media_device_for_each_link'
   - 'media_device_for_each_pad'
-  - 'mp_bvec_for_each_page'
-  - 'mp_bvec_for_each_segment'
   - 'nanddev_io_for_each_page'
   - 'netdev_for_each_lower_dev'
   - 'netdev_for_each_lower_private'
@@ -381,18 +391,19 @@ ForEachMacros:
   - 'radix_tree_for_each_slot'
   - 'radix_tree_for_each_tagged'
   - 'rbtree_postorder_for_each_entry_safe'
+  - 'rdma_for_each_block'
   - 'rdma_for_each_port'
   - 'resource_list_for_each_entry'
   - 'resource_list_for_each_entry_safe'
   - 'rhl_for_each_entry_rcu'
   - 'rhl_for_each_rcu'
   - 'rht_for_each'
-  - 'rht_for_each_from'
   - 'rht_for_each_entry'
   - 'rht_for_each_entry_from'
   - 'rht_for_each_entry_rcu'
   - 'rht_for_each_entry_rcu_from'
   - 'rht_for_each_entry_safe'
+  - 'rht_for_each_from'
   - 'rht_for_each_rcu'
   - 'rht_for_each_rcu_from'
   - '__rq_for_each_bio'
diff --git a/.mailmap b/.mailmap
index acba1a6163f1..afaad605284a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -64,6 +64,9 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
 Dengcheng Zhu <dzhu@wavecomp.com> <dczhu@mips.com>
 Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
+Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
+Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
 Domen Puncer <domen@coderock.org>
 Douglas Gilbert <dougg@torque.net>
 Ed L. Cashin <ecashin@coraid.com>
@@ -160,6 +163,8 @@ Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.co
 Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
 Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
 Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
+Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
+Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
 Mayuresh Janorkar <mayur@ti.com>
 Michael Buesch <m@bues.ch>
 Michel Dänzer <michel@tungstengraphics.com>
diff --git a/Documentation/PCI/index.rst b/Documentation/PCI/index.rst
index f4c6121868c3..6768305e4c26 100644
--- a/Documentation/PCI/index.rst
+++ b/Documentation/PCI/index.rst
@@ -9,7 +9,7 @@ Linux PCI Bus Subsystem
    :numbered:
 
    pci
-   picebus-howto
+   pciebus-howto
    pci-iov-howto
    msi-howto
    acpi-info
diff --git a/Documentation/PCI/picebus-howto.rst b/Documentation/PCI/pciebus-howto.rst
index f882ff62c51f..f882ff62c51f 100644
--- a/Documentation/PCI/picebus-howto.rst
+++ b/Documentation/PCI/pciebus-howto.rst
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 47d981a86e2f..d31ffa110461 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1732,6 +1732,11 @@
                         Note that using this option lowers the security
                         provided by tboot because it makes the system
                         vulnerable to DMA attacks.
+                nobounce [Default off]
+                        Disable bounce buffer for unstrusted devices such as
+                        the Thunderbolt devices. This will treat the untrusted
+                        devices as the trusted ones, hence might expose security
+                        risks of DMA attacks.
 
         intel_idle.max_cstate=  [KNL,HW,ACPI,X86]
                         0       disables intel_idle and fall back on acpi_idle.
@@ -1811,7 +1816,7 @@
                           synchronously.
 
         iommu.passthrough=
-                        [ARM64] Configure DMA to bypass the IOMMU by default.
+                        [ARM64, X86] Configure DMA to bypass the IOMMU by default.
                         Format: { "0" | "1" }
                         0 - Use IOMMU translation for DMA.
                         1 - Bypass the IOMMU for DMA.
@@ -4090,6 +4095,13 @@
                         Run specified binary instead of /init from the ramdisk,
                         used for early userspace startup. See initrd.
 
+        rdrand=         [X86]
+                        force - Override the decision by the kernel to hide the
+                                advertisement of RDRAND support (this affects
+                                certain AMD processors because of buggy BIOS
+                                support, specifically around the suspend/resume
+                                path).
+
         rdt=            [HW,X86,RDT]
                         Turn on/off individual RDT features. List is:
                         cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, l2cdp,
diff --git a/Documentation/admin-guide/sysctl/net.rst b/Documentation/admin-guide/sysctl/net.rst
index a7d44e71019d..287b98708a40 100644
--- a/Documentation/admin-guide/sysctl/net.rst
+++ b/Documentation/admin-guide/sysctl/net.rst
@@ -39,7 +39,6 @@ Table : Subdirectories in /proc/sys/net
  802       E802 protocol         ax25       AX25
  ethernet  Ethernet protocol     rose       X.25 PLP layer
  ipv4      IP version 4          x25        X.25 protocol
- ipx       IPX                   token-ring IBM token ring
  bridge    Bridging              decnet     DEC net
  ipv6      IP version 6          tipc       TIPC
  ========= =================== = ========== ==================
@@ -401,33 +400,7 @@ interface.
 (network) that the route leads to, the router (may be directly connected), the
 route flags, and the device the route is using.
 
-
-5. IPX
-------
-
-The IPX protocol has no tunable values in proc/sys/net.
-
-The IPX  protocol  does,  however,  provide  proc/net/ipx. This lists each IPX
-socket giving  the  local  and  remote  addresses  in  Novell  format (that is
-network:node:port). In  accordance  with  the  strange  Novell  tradition,
-everything but the port is in hex. Not_Connected is displayed for sockets that
-are not  tied to a specific remote address. The Tx and Rx queue sizes indicate
-the number  of  bytes  pending  for  transmission  and  reception.  The  state
-indicates the  state  the  socket  is  in and the uid is the owning uid of the
-socket.
-
-The /proc/net/ipx_interface  file lists all IPX interfaces. For each interface
-it gives  the network number, the node number, and indicates if the network is
-the primary  network.  It  also  indicates  which  device  it  is bound to (or
-Internal for  internal  networks)  and  the  Frame  Type if appropriate. Linux
-supports 802.3,  802.2,  802.2  SNAP  and DIX (Blue Book) ethernet framing for
-IPX.
-
-The /proc/net/ipx_route  table  holds  a list of IPX routes. For each route it
-gives the  destination  network, the router node (or Directly) and the network
-address of the router (or Connected) for internal networks.
-
-6. TIPC
+5. TIPC
 -------
 
 tipc_rmem
diff --git a/Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt
index 09fc02b99845..a5c1db95b3ec 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt
@@ -1,20 +1,30 @@
 * ARC-HS Interrupt Distribution Unit
 
-  This optional 2nd level interrupt controller can be used in SMP configurations for
-  dynamic IRQ routing, load balancing of common/external IRQs towards core intc.
+  This optional 2nd level interrupt controller can be used in SMP configurations
+  for dynamic IRQ routing, load balancing of common/external IRQs towards core
+  intc.
 
 Properties:
 
 - compatible: "snps,archs-idu-intc"
 - interrupt-controller: This is an interrupt controller.
-- #interrupt-cells: Must be <1>.
-
-  Value of the cell specifies the "common" IRQ from peripheral to IDU. Number N
-  of the particular interrupt line of IDU corresponds to the line N+24 of the
-  core interrupt controller.
-
-  intc accessed via the special ARC AUX register interface, hence "reg" property
-  is not specified.
+- #interrupt-cells: Must be <1> or <2>.
+
+  Value of the first cell specifies the "common" IRQ from peripheral to IDU.
+  Number N of the particular interrupt line of IDU corresponds to the line N+24
+  of the core interrupt controller.
+
+  The (optional) second cell specifies any of the following flags:
+    - bits[3:0] trigger type and level flags
+        1 = low-to-high edge triggered
+        2 = NOT SUPPORTED (high-to-low edge triggered)
+        4 = active high level-sensitive <<< DEFAULT
+        8 = NOT SUPPORTED (active low level-sensitive)
+  When no second cell is specified, the interrupt is assumed to be level
+  sensitive.
+
+  The interrupt controller is accessed via the special ARC AUX register
+  interface, hence "reg" property is not specified.
 
 Example:
         core_intc: core-interrupt-controller {
diff --git a/Documentation/devicetree/bindings/iommu/mediatek,iommu.txt b/Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
index 6922db598def..ce59a505f5a4 100644
--- a/Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
+++ b/Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
@@ -11,10 +11,23 @@ ARM Short-Descriptor translation table format for address translation.
                |
               m4u (Multimedia Memory Management Unit)
                |
+          +--------+
+          |        |
+      gals0-rx   gals1-rx    (Global Async Local Sync rx)
+          |        |
+          |        |
+      gals0-tx   gals1-tx    (Global Async Local Sync tx)
+          |        |          Some SoCs may have GALS.
+          +--------+
+               |
            SMI Common(Smart Multimedia Interface Common)
                |
        +----------------+-------
        |                |
+       |             gals-rx        There may be GALS in some larbs.
+       |                |
+       |                |
+       |             gals-tx
        |                |
    SMI larb0        SMI larb1   ... SoCs have several SMI local arbiter(larb).
    (display)         (vdec)
@@ -36,6 +49,10 @@ each local arbiter.
 like display, video decode, and camera. And there are different ports
 in each larb. Take a example, There are many ports like MC, PP, VLD in the
 video decode local arbiter, all these ports are according to the video HW.
+  In some SoCs, there may be a GALS(Global Async Local Sync) module between
+smi-common and m4u, and additional GALS module between smi-larb and
+smi-common. GALS can been seen as a "asynchronous fifo" which could help
+synchronize for the modules in different clock frequency.
 
 Required properties:
 - compatible : must be one of the following string:
@@ -44,18 +61,25 @@ Required properties:
         "mediatek,mt7623-m4u", "mediatek,mt2701-m4u" for mt7623 which uses
                                                      generation one m4u HW.
         "mediatek,mt8173-m4u" for mt8173 which uses generation two m4u HW.
+        "mediatek,mt8183-m4u" for mt8183 which uses generation two m4u HW.
 - reg : m4u register base and size.
 - interrupts : the interrupt of m4u.
 - clocks : must contain one entry for each clock-names.
-- clock-names : must be "bclk", It is the block clock of m4u.
+- clock-names : Only 1 optional clock:
+  - "bclk": the block clock of m4u.
+  Here is the list which require this "bclk":
+  - mt2701, mt2712, mt7623 and mt8173.
+  Note that m4u use the EMI clock which always has been enabled before kernel
+  if there is no this "bclk".
 - mediatek,larbs : List of phandle to the local arbiters in the current Socs.
         Refer to bindings/memory-controllers/mediatek,smi-larb.txt. It must sort
         according to the local arbiter index, like larb0, larb1, larb2...
 - iommu-cells : must be 1. This is the mtk_m4u_id according to the HW.
         Specifies the mtk_m4u_id as defined in
         dt-binding/memory/mt2701-larb-port.h for mt2701, mt7623
-        dt-binding/memory/mt2712-larb-port.h for mt2712, and
-        dt-binding/memory/mt8173-larb-port.h for mt8173.
+        dt-binding/memory/mt2712-larb-port.h for mt2712,
+        dt-binding/memory/mt8173-larb-port.h for mt8173, and
+        dt-binding/memory/mt8183-larb-port.h for mt8183.
 
 Example:
         iommu: iommu@10205000 {
diff --git a/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.txt b/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.txt
index e937ddd871a6..b478ade4da65 100644
--- a/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.txt
+++ b/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.txt
@@ -2,9 +2,10 @@ SMI (Smart Multimedia Interface) Common
 
 The hardware block diagram please check bindings/iommu/mediatek,iommu.txt
 
-Mediatek SMI have two generations of HW architecture, mt2712 and mt8173 use
-the second generation of SMI HW while mt2701 uses the first generation HW of
-SMI.
+Mediatek SMI have two generations of HW architecture, here is the list
+which generation the SoCs use:
+generation 1: mt2701 and mt7623.
+generation 2: mt2712, mt8173 and mt8183.
 
 There's slight differences between the two SMI, for generation 2, the
 register which control the iommu port is at each larb's register base. But
@@ -19,6 +20,7 @@ Required properties:
         "mediatek,mt2712-smi-common"
         "mediatek,mt7623-smi-common", "mediatek,mt2701-smi-common"
         "mediatek,mt8173-smi-common"
+        "mediatek,mt8183-smi-common"
 - reg : the register and size of the SMI block.
 - power-domains : a phandle to the power domain of this local arbiter.
 - clocks : Must contain an entry for each entry in clock-names.
@@ -30,6 +32,10 @@ Required properties:
             They may be the same if both source clocks are the same.
   - "async" : asynchronous clock, it help transform the smi clock into the emi
               clock domain, this clock is only needed by generation 1 smi HW.
+  and these 2 option clocks for generation 2 smi HW:
+  - "gals0": the path0 clock of GALS(Global Async Local Sync).
+  - "gals1": the path1 clock of GALS(Global Async Local Sync).
+  Here is the list which has this GALS: mt8183.
 
 Example:
         smi_common: smi@14022000 {
diff --git a/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt b/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt
index 94eddcae77ab..4b369b3e1a69 100644
--- a/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt
+++ b/Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt
@@ -8,6 +8,7 @@ Required properties:
                 "mediatek,mt2712-smi-larb"
                 "mediatek,mt7623-smi-larb", "mediatek,mt2701-smi-larb"
                 "mediatek,mt8173-smi-larb"
+                "mediatek,mt8183-smi-larb"
 - reg : the register and size of this local arbiter.
 - mediatek,smi : a phandle to the smi_common node.
 - power-domains : a phandle to the power domain of this local arbiter.
@@ -16,6 +17,9 @@ Required properties:
   - "apb" : Advanced Peripheral Bus clock, It's the clock for setting
             the register.
   - "smi" : It's the clock for transfer data and command.
+  and this optional clock name:
+  - "gals": the clock for GALS(Global Async Local Sync).
+  Here is the list which has this GALS: mt8183.
 
 Required property for mt2701, mt2712 and mt7623:
 - mediatek,larb-id :the hardware id of this larb.
diff --git a/Documentation/devicetree/bindings/net/dsa/ksz.txt b/Documentation/devicetree/bindings/net/dsa/ksz.txt
index 4ac21cef370e..113e7ac79aad 100644
--- a/Documentation/devicetree/bindings/net/dsa/ksz.txt
+++ b/Documentation/devicetree/bindings/net/dsa/ksz.txt
@@ -12,6 +12,7 @@ Required properties:
   - "microchip,ksz8565"
   - "microchip,ksz9893"
   - "microchip,ksz9563"
+  - "microchip,ksz8563"
 
 Optional properties:
 
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
index 63c73fafe26d..0b61a90f1592 100644
--- a/Documentation/devicetree/bindings/net/macb.txt
+++ b/Documentation/devicetree/bindings/net/macb.txt
@@ -15,10 +15,10 @@ Required properties:
   Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
   Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.
   Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC.
-  Use "sifive,fu540-macb" for SiFive FU540-C000 SoC.
+  Use "sifive,fu540-c000-gem" for SiFive FU540-C000 SoC.
   Or the generic form: "cdns,emac".
 - reg: Address and length of the register set for the device
-        For "sifive,fu540-macb", second range is required to specify the
+        For "sifive,fu540-c000-gem", second range is required to specify the
         address and length of the registers for GEMGXL Management block.
 - interrupts: Should contain macb interrupt
 - phy-mode: See ethernet.txt file in the same directory.
diff --git a/Documentation/networking/tls-offload.rst b/Documentation/networking/tls-offload.rst
index b70b70dc4524..0dd3f748239f 100644
--- a/Documentation/networking/tls-offload.rst
+++ b/Documentation/networking/tls-offload.rst
@@ -506,21 +506,3 @@ Drivers should ignore the changes to TLS the device feature flags.
 These flags will be acted upon accordingly by the core ``ktls`` code.
 TLS device feature flags only control adding of new TLS connection
 offloads, old connections will remain active after flags are cleared.
-
-Known bugs
-==========
-
-skb_orphan() leaks clear text
------------------------------
-
-Currently drivers depend on the :c:member:`sk` member of
-:c:type:`struct sk_buff <sk_buff>` to identify segments requiring
-encryption. Any operation which removes or does not preserve the socket
-association such as :c:func:`skb_orphan` or :c:func:`skb_clone`
-will cause the driver to miss the packets and lead to clear text leaks.
-
-Redirects leak clear text
--------------------------
-
-In the RX direction, if segment has already been decrypted by the device
-and it gets redirected or mirrored - clear text will be transmitted out.
diff --git a/Documentation/networking/tuntap.txt b/Documentation/networking/tuntap.txt
index 949d5dcdd9a3..0104830d5075 100644
--- a/Documentation/networking/tuntap.txt
+++ b/Documentation/networking/tuntap.txt
@@ -204,8 +204,8 @@ Ethernet device, which instead of receiving packets from a physical
 media, receives them from user space program and instead of sending 
 packets via physical media sends them to the user space program. 
 
-Let's say that you configured IPX on the tap0, then whenever 
-the kernel sends an IPX packet to tap0, it is passed to the application
+Let's say that you configured IPv6 on the tap0, then whenever
+the kernel sends an IPv6 packet to tap0, it is passed to the application
 (VTun for example). The application encrypts, compresses and sends it to 
 the other side over TCP or UDP. The application on the other side decompresses
 and decrypts the data received and writes the packet to the TAP device, 
diff --git a/Documentation/process/embargoed-hardware-issues.rst b/Documentation/process/embargoed-hardware-issues.rst
new file mode 100644
index 000000000000..402636356fbe
--- /dev/null
+++ b/Documentation/process/embargoed-hardware-issues.rst
@@ -0,0 +1,279 @@
+Embargoed hardware issues
+=========================
+
+Scope
+-----
+
+Hardware issues which result in security problems are a different category
+of security bugs than pure software bugs which only affect the Linux
+kernel.
+
+Hardware issues like Meltdown, Spectre, L1TF etc. must be treated
+differently because they usually affect all Operating Systems ("OS") and
+therefore need coordination across different OS vendors, distributions,
+hardware vendors and other parties. For some of the issues, software
+mitigations can depend on microcode or firmware updates, which need further
+coordination.
+
+.. _Contact:
+
+Contact
+-------
+
+The Linux kernel hardware security team is separate from the regular Linux
+kernel security team.
+
+The team only handles the coordination of embargoed hardware security
+issues.  Reports of pure software security bugs in the Linux kernel are not
+handled by this team and the reporter will be guided to contact the regular
+Linux kernel security team (:ref:`Documentation/admin-guide/
+<securitybugs>`) instead.
+
+The team can be contacted by email at <hardware-security@kernel.org>. This
+is a private list of security officers who will help you to coordinate an
+issue according to our documented process.
+
+The list is encrypted and email to the list can be sent by either PGP or
+S/MIME encrypted and must be signed with the reporter's PGP key or S/MIME
+certificate. The list's PGP key and S/MIME certificate are available from
+https://www.kernel.org/....
+
+While hardware security issues are often handled by the affected hardware
+vendor, we welcome contact from researchers or individuals who have
+identified a potential hardware flaw.
+
+Hardware security officers
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The current team of hardware security officers:
+
+  - Linus Torvalds (Linux Foundation Fellow)
+  - Greg Kroah-Hartman (Linux Foundation Fellow)
+  - Thomas Gleixner (Linux Foundation Fellow)
+
+Operation of mailing-lists
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The encrypted mailing-lists which are used in our process are hosted on
+Linux Foundation's IT infrastructure. By providing this service Linux
+Foundation's director of IT Infrastructure security technically has the
+ability to access the embargoed information, but is obliged to
+confidentiality by his employment contract. Linux Foundation's director of
+IT Infrastructure security is also responsible for the kernel.org
+infrastructure.
+
+The Linux Foundation's current director of IT Infrastructure security is
+Konstantin Ryabitsev.
+
+
+Non-disclosure agreements
+-------------------------
+
+The Linux kernel hardware security team is not a formal body and therefore
+unable to enter into any non-disclosure agreements.  The kernel community
+is aware of the sensitive nature of such issues and offers a Memorandum of
+Understanding instead.
+
+
+Memorandum of Understanding
+---------------------------
+
+The Linux kernel community has a deep understanding of the requirement to
+keep hardware security issues under embargo for coordination between
+different OS vendors, distributors, hardware vendors and other parties.
+
+The Linux kernel community has successfully handled hardware security
+issues in the past and has the necessary mechanisms in place to allow
+community compliant development under embargo restrictions.
+
+The Linux kernel community has a dedicated hardware security team for
+initial contact, which oversees the process of handling such issues under
+embargo rules.
+
+The hardware security team identifies the developers (domain experts) who
+will form the initial response team for a particular issue. The initial
+response team can bring in further developers (domain experts) to address
+the issue in the best technical way.
+
+All involved developers pledge to adhere to the embargo rules and to keep
+the received information confidential. Violation of the pledge will lead to
+immediate exclusion from the current issue and removal from all related
+mailing-lists. In addition, the hardware security team will also exclude
+the offender from future issues. The impact of this consequence is a highly
+effective deterrent in our community. In case a violation happens the
+hardware security team will inform the involved parties immediately. If you
+or anyone becomes aware of a potential violation, please report it
+immediately to the Hardware security officers.
+
+
+Process
+^^^^^^^
+
+Due to the globally distributed nature of Linux kernel development,
+face-to-face meetings are almost impossible to address hardware security
+issues.  Phone conferences are hard to coordinate due to time zones and
+other factors and should be only used when absolutely necessary. Encrypted
+email has been proven to be the most effective and secure communication
+method for these types of issues.
+
+Start of Disclosure
+"""""""""""""""""""
+
+Disclosure starts by contacting the Linux kernel hardware security team by
+email. This initial contact should contain a description of the problem and
+a list of any known affected hardware. If your organization builds or
+distributes the affected hardware, we encourage you to also consider what
+other hardware could be affected.
+
+The hardware security team will provide an incident-specific encrypted
+mailing-list which will be used for initial discussion with the reporter,
+further disclosure and coordination.
+
+The hardware security team will provide the disclosing party a list of
+developers (domain experts) who should be informed initially about the
+issue after confirming with the developers  that they will adhere to this
+Memorandum of Understanding and the documented process. These developers
+form the initial response team and will be responsible for handling the
+issue after initial contact. The hardware security team is supporting the
+response team, but is not necessarily involved in the mitigation
+development process.
+
+While individual developers might be covered by a non-disclosure agreement
+via their employer, they cannot enter individual non-disclosure agreements
+in their role as Linux kernel developers. They will, however, agree to
+adhere to this documented process and the Memorandum of Understanding.
+
+
+Disclosure
+""""""""""
+
+The disclosing party provides detailed information to the initial response
+team via the specific encrypted mailing-list.
+
+From our experience the technical documentation of these issues is usually
+a sufficient starting point and further technical clarification is best
+done via email.
+
+Mitigation development
+""""""""""""""""""""""
+
+The initial response team sets up an encrypted mailing-list or repurposes
+an existing one if appropriate. The disclosing party should provide a list
+of contacts for all other parties who have already been, or should be,
+informed about the issue. The response team contacts these parties so they
+can name experts who should be subscribed to the mailing-list.
+
+Using a mailing-list is close to the normal Linux development process and
+has been successfully used in developing mitigations for various hardware
+security issues in the past.
+
+The mailing-list operates in the same way as normal Linux development.
+Patches are posted, discussed and reviewed and if agreed on applied to a
+non-public git repository which is only accessible to the participating
+developers via a secure connection. The repository contains the main
+development branch against the mainline kernel and backport branches for
+stable kernel versions as necessary.
+
+The initial response team will identify further experts from the Linux
+kernel developer community as needed and inform the disclosing party about
+their participation. Bringing in experts can happen at any time of the
+development process and often needs to be handled in a timely manner.
+
+Coordinated release
+"""""""""""""""""""
+
+The involved parties will negotiate the date and time where the embargo
+ends. At that point the prepared mitigations are integrated into the
+relevant kernel trees and published.
+
+While we understand that hardware security issues need coordinated embargo
+time, the embargo time should be constrained to the minimum time which is
+required for all involved parties to develop, test and prepare the
+mitigations. Extending embargo time artificially to meet conference talk
+dates or other non-technical reasons is creating more work and burden for
+the involved developers and response teams as the patches need to be kept
+up to date in order to follow the ongoing upstream kernel development,
+which might create conflicting changes.
+
+CVE assignment
+""""""""""""""
+
+Neither the hardware security team nor the initial response team assign
+CVEs, nor are CVEs required for the development process. If CVEs are
+provided by the disclosing party they can be used for documentation
+purposes.
+
+Process ambassadors
+-------------------
+
+For assistance with this process we have established ambassadors in various
+organizations, who can answer questions about or provide guidance on the
+reporting process and further handling. Ambassadors are not involved in the
+disclosure of a particular issue, unless requested by a response team or by
+an involved disclosed party. The current ambassadors list:
+
+  ============= ========================================================
+  ARM
+  AMD
+  IBM
+  Intel
+  Qualcomm      Trilok Soni <tsoni@codeaurora.org>
+
+  Microsoft     Sasha Levin <sashal@kernel.org>
+  VMware
+  Xen           Andrew Cooper <andrew.cooper3@citrix.com>
+
+  Canonical     Tyler Hicks <tyhicks@canonical.com>
+  Debian        Ben Hutchings <ben@decadent.org.uk>
+  Oracle        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+  Red Hat       Josh Poimboeuf <jpoimboe@redhat.com>
+  SUSE          Jiri Kosina <jkosina@suse.cz>
+
+  Amazon
+  Google        Kees Cook <keescook@chromium.org>
+  ============= ========================================================
+
+If you want your organization to be added to the ambassadors list, please
+contact the hardware security team. The nominated ambassador has to
+understand and support our process fully and is ideally well connected in
+the Linux kernel community.
+
+Encrypted mailing-lists
+-----------------------
+
+We use encrypted mailing-lists for communication. The operating principle
+of these lists is that email sent to the list is encrypted either with the
+list's PGP key or with the list's S/MIME certificate. The mailing-list
+software decrypts the email and re-encrypts it individually for each
+subscriber with the subscriber's PGP key or S/MIME certificate. Details
+about the mailing-list software and the setup which is used to ensure the
+security of the lists and protection of the data can be found here:
+https://www.kernel.org/....
+
+List keys
+^^^^^^^^^
+
+For initial contact see :ref:`Contact`. For incident specific mailing-lists
+the key and S/MIME certificate are conveyed to the subscribers by email
+sent from the specific list.
+
+Subscription to incident specific lists
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Subscription is handled by the response teams. Disclosed parties who want
+to participate in the communication send a list of potential subscribers to
+the response team so the response team can validate subscription requests.
+
+Each subscriber needs to send a subscription request to the response team
+by email. The email must be signed with the subscriber's PGP key or S/MIME
+certificate. If a PGP key is used, it must be available from a public key
+server and is ideally connected to the Linux kernel's PGP web of trust. See
+also: https://www.kernel.org/signature.html.
+
+The response team verifies that the subscriber request is valid and adds
+the subscriber to the list. After subscription the subscriber will receive
+email from the mailing-list which is signed either with the list's PGP key
+or the list's S/MIME certificate. The subscriber's email client can extract
+the PGP key or the S/MIME certificate from the signature so the subscriber
+can send encrypted email to the list.
+
diff --git a/Documentation/process/index.rst b/Documentation/process/index.rst
index 878ebfda7eef..e2c9ffc682c5 100644
--- a/Documentation/process/index.rst
+++ b/Documentation/process/index.rst
@@ -45,6 +45,7 @@ Other guides to the community that are of interest to most developers are:
    submit-checklist
    kernel-docs
    deprecated
+   embargoed-hardware-issues
 
 These are some overall technical guides that have been put here for now for
 lack of a better place.
diff --git a/MAINTAINERS b/MAINTAINERS
index cf04f72ca79f..ae8536cba798 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -183,7 +183,7 @@ M:	Realtek linux nic maintainers <nic_swsd@realtek.com>
 M:      Heiner Kallweit <hkallweit1@gmail.com>
 L:      netdev@vger.kernel.org
 S:      Maintained
-F:      drivers/net/ethernet/realtek/r8169.c
+F:      drivers/net/ethernet/realtek/r8169*
 
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
 M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -683,7 +683,7 @@ S:	Maintained
 F:      drivers/crypto/sunxi-ss/
 
 ALLWINNER VPU DRIVER
-M:      Maxime Ripard <maxime.ripard@bootlin.com>
+M:      Maxime Ripard <mripard@kernel.org>
 M:      Paul Kocialkowski <paul.kocialkowski@bootlin.com>
 L:      linux-media@vger.kernel.org
 S:      Maintained
@@ -1407,7 +1407,7 @@ S:	Maintained
 F:      drivers/clk/sunxi/
 
 ARM/Allwinner sunXi SoC support
-M:      Maxime Ripard <maxime.ripard@bootlin.com>
+M:      Maxime Ripard <mripard@kernel.org>
 M:      Chen-Yu Tsai <wens@csie.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
@@ -3576,7 +3576,7 @@ F:	Documentation/filesystems/caching/cachefiles.txt
 F:      fs/cachefiles/
 
 CADENCE MIPI-CSI2 BRIDGES
-M:      Maxime Ripard <maxime.ripard@bootlin.com>
+M:      Maxime Ripard <mripard@kernel.org>
 L:      linux-media@vger.kernel.org
 S:      Maintained
 F:      Documentation/devicetree/bindings/media/cdns,*.txt
@@ -5294,7 +5294,7 @@ F:	include/linux/vga*
 
 DRM DRIVERS AND MISC GPU PATCHES
 M:      Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
-M:      Maxime Ripard <maxime.ripard@bootlin.com>
+M:      Maxime Ripard <mripard@kernel.org>
 M:      Sean Paul <sean@poorly.run>
 W:      https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
 S:      Maintained
@@ -5307,7 +5307,7 @@ F:	include/uapi/drm/drm*
 F:      include/linux/vga*
 
 DRM DRIVERS FOR ALLWINNER A10
-M:      Maxime Ripard  <maxime.ripard@bootlin.com>
+M:      Maxime Ripard <mripard@kernel.org>
 L:      dri-devel@lists.freedesktop.org
 S:      Supported
 F:      drivers/gpu/drm/sun4i/
@@ -6064,7 +6064,7 @@ M:	Florian Fainelli <f.fainelli@gmail.com>
 M:      Heiner Kallweit <hkallweit1@gmail.com>
 L:      netdev@vger.kernel.org
 S:      Maintained
-F:      Documentation/ABI/testing/sysfs-bus-mdio
+F:      Documentation/ABI/testing/sysfs-class-net-phydev
 F:      Documentation/devicetree/bindings/net/ethernet-phy.yaml
 F:      Documentation/devicetree/bindings/net/mdio*
 F:      Documentation/networking/phy.rst
@@ -7512,7 +7512,7 @@ I2C MV64XXX MARVELL AND ALLWINNER DRIVER
 M:      Gregory CLEMENT <gregory.clement@bootlin.com>
 L:      linux-i2c@vger.kernel.org
 S:      Maintained
-F:      Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
+F:      Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
 F:      drivers/i2c/busses/i2c-mv64xxx.c
 
 I2C OVER PARALLEL PORT
@@ -8453,11 +8453,6 @@ S:	Maintained
 F:      fs/io_uring.c
 F:      include/uapi/linux/io_uring.h
 
-IP MASQUERADING
-M:      Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
-S:      Maintained
-F:      net/ipv4/netfilter/ipt_MASQUERADE.c
-
 IPMI SUBSYSTEM
 M:      Corey Minyard <minyard@acm.org>
 L:      openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)
@@ -8831,14 +8826,6 @@ F:	virt/kvm/*
 F:      tools/kvm/
 F:      tools/testing/selftests/kvm/
 
-KERNEL VIRTUAL MACHINE FOR AMD-V (KVM/amd)
-M:      Joerg Roedel <joro@8bytes.org>
-L:      kvm@vger.kernel.org
-W:      http://www.linux-kvm.org/
-S:      Maintained
-F:      arch/x86/include/asm/svm.h
-F:      arch/x86/kvm/svm.c
-
 KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
 M:      Marc Zyngier <maz@kernel.org>
 R:      James Morse <james.morse@arm.com>
@@ -8881,7 +8868,7 @@ M:	Christian Borntraeger <borntraeger@de.ibm.com>
 M:      Janosch Frank <frankja@linux.ibm.com>
 R:      David Hildenbrand <david@redhat.com>
 R:      Cornelia Huck <cohuck@redhat.com>
-L:      linux-s390@vger.kernel.org
+L:      kvm@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
 S:      Supported
@@ -8896,6 +8883,11 @@ F:	tools/testing/selftests/kvm/*/s390x/
 KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
 M:      Paolo Bonzini <pbonzini@redhat.com>
 M:      Radim Krčmář <rkrcmar@redhat.com>
+R:      Sean Christopherson <sean.j.christopherson@intel.com>
+R:      Vitaly Kuznetsov <vkuznets@redhat.com>
+R:      Wanpeng Li <wanpengli@tencent.com>
+R:      Jim Mattson <jmattson@google.com>
+R:      Joerg Roedel <joro@8bytes.org>
 L:      kvm@vger.kernel.org
 W:      http://www.linux-kvm.org
 T:      git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
@@ -8903,8 +8895,12 @@ S:	Supported
 F:      arch/x86/kvm/
 F:      arch/x86/kvm/*/
 F:      arch/x86/include/uapi/asm/kvm*
+F:      arch/x86/include/uapi/asm/vmx.h
+F:      arch/x86/include/uapi/asm/svm.h
 F:      arch/x86/include/asm/kvm*
 F:      arch/x86/include/asm/pvclock-abi.h
+F:      arch/x86/include/asm/svm.h
+F:      arch/x86/include/asm/vmx.h
 F:      arch/x86/kernel/kvm.c
 F:      arch/x86/kernel/kvmclock.c
 
@@ -9232,6 +9228,18 @@ F:	include/linux/nd.h
 F:      include/linux/libnvdimm.h
 F:      include/uapi/linux/ndctl.h
 
+LICENSES and SPDX stuff
+M:      Thomas Gleixner <tglx@linutronix.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+L:      linux-spdx@vger.kernel.org
+S:      Maintained
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git
+F:      COPYING
+F:      Documentation/process/license-rules.rst
+F:      LICENSES/
+F:      scripts/spdxcheck-test.sh
+F:      scripts/spdxcheck.py
+
 LIGHTNVM PLATFORM SUPPORT
 M:      Matias Bjorling <mb@lightnvm.io>
 W:      http://github/OpenChannelSSD
@@ -11084,7 +11092,7 @@ NET_FAILOVER MODULE
 M:      Sridhar Samudrala <sridhar.samudrala@intel.com>
 L:      netdev@vger.kernel.org
 S:      Supported
-F:      driver/net/net_failover.c
+F:      drivers/net/net_failover.c
 F:      include/net/net_failover.h
 F:      Documentation/networking/net_failover.rst
 
@@ -14476,6 +14484,7 @@ F:	drivers/net/phy/phylink.c
 F:      drivers/net/phy/sfp*
 F:      include/linux/phylink.h
 F:      include/linux/sfp.h
+K:      phylink
 
 SGI GRU DRIVER
 M:      Dimitri Sivanich <sivanich@sgi.com>
@@ -14881,9 +14890,9 @@ F:	include/linux/arm_sdei.h
 F:      include/uapi/linux/arm_sdei.h
 
 SOFTWARE RAID (Multiple Disks) SUPPORT
-M:      Shaohua Li <shli@kernel.org>
+M:      Song Liu <song@kernel.org>
 L:      linux-raid@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/song/md.git
 S:      Supported
 F:      drivers/md/Makefile
 F:      drivers/md/Kconfig
diff --git a/Makefile b/Makefile
index 9fa18613566f..9b08f6383a52 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 5
 PATCHLEVEL = 3
 SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc8
 NAME = Bobtail Squid
 
 # *DOCUMENTATION*
diff --git a/arch/arc/boot/dts/Makefile b/arch/arc/boot/dts/Makefile
index a83c4f5e928b..8483a86c743d 100644
--- a/arch/arc/boot/dts/Makefile
+++ b/arch/arc/boot/dts/Makefile
@@ -12,3 +12,6 @@ dtb-y := $(builtindtb-y).dtb
 # for CONFIG_OF_ALL_DTBS test
 dtstree := $(srctree)/$(src)
 dtb-    := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
+
+# board-specific dtc flags
+DTC_FLAGS_hsdk += --pad 20
diff --git a/arch/arc/include/asm/entry-arcv2.h b/arch/arc/include/asm/entry-arcv2.h
index f5ae394ebe06..41b16f21beec 100644
--- a/arch/arc/include/asm/entry-arcv2.h
+++ b/arch/arc/include/asm/entry-arcv2.h
@@ -256,7 +256,7 @@
 
 .macro FAKE_RET_FROM_EXCPN
         lr      r9, [status32]
-        bic     r9, r9, (STATUS_U_MASK|STATUS_DE_MASK|STATUS_AE_MASK)
+        bic     r9, r9, STATUS_AE_MASK
         or      r9, r9, STATUS_IE_MASK
         kflag   r9
 .endm
diff --git a/arch/arc/include/asm/linkage.h b/arch/arc/include/asm/linkage.h
index a0eeb9f8f0a9..d9ee43c6b7db 100644
--- a/arch/arc/include/asm/linkage.h
+++ b/arch/arc/include/asm/linkage.h
@@ -62,15 +62,15 @@
 #else   /* !__ASSEMBLY__ */
 
 #ifdef CONFIG_ARC_HAS_ICCM
-#define __arcfp_code __attribute__((__section__(".text.arcfp")))
+#define __arcfp_code __section(.text.arcfp)
 #else
-#define __arcfp_code __attribute__((__section__(".text")))
+#define __arcfp_code __section(.text)
 #endif
 
 #ifdef CONFIG_ARC_HAS_DCCM
-#define __arcfp_data __attribute__((__section__(".data.arcfp")))
+#define __arcfp_data __section(.data.arcfp)
 #else
-#define __arcfp_data __attribute__((__section__(".data")))
+#define __arcfp_data __section(.data)
 #endif
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/arc/include/asm/mach_desc.h b/arch/arc/include/asm/mach_desc.h
index 8ac0e2ac3e70..73746ed5b834 100644
--- a/arch/arc/include/asm/mach_desc.h
+++ b/arch/arc/include/asm/mach_desc.h
@@ -53,8 +53,7 @@ extern const struct machine_desc __arch_info_begin[], __arch_info_end[];
  */
 #define MACHINE_START(_type, _name)                     \
 static const struct machine_desc __mach_desc_##_type    \
-__used                                                  \
-__attribute__((__section__(".arch.info.init"))) = {     \
+__used __section(.arch.info.init) = {                   \
         .name           = _name,
 
 #define MACHINE_END                             \
diff --git a/arch/arc/kernel/mcip.c b/arch/arc/kernel/mcip.c
index 18b493dfb3a8..abf9398cc333 100644
--- a/arch/arc/kernel/mcip.c
+++ b/arch/arc/kernel/mcip.c
@@ -202,8 +202,8 @@ static void idu_set_dest(unsigned int cmn_irq, unsigned int cpu_mask)
         __mcip_cmd_data(CMD_IDU_SET_DEST, cmn_irq, cpu_mask);
 }
 
-static void idu_set_mode(unsigned int cmn_irq, unsigned int lvl,
-                           unsigned int distr)
+static void idu_set_mode(unsigned int cmn_irq, bool set_lvl, unsigned int lvl,
+                         bool set_distr, unsigned int distr)
 {
         union {
                 unsigned int word;
@@ -212,8 +212,11 @@ static void idu_set_mode(unsigned int cmn_irq, unsigned int lvl,
                 };
         } data;
 
-        data.distr = distr;
-        data.lvl = lvl;
+        data.word = __mcip_cmd_read(CMD_IDU_READ_MODE, cmn_irq);
+        if (set_distr)
+                data.distr = distr;
+        if (set_lvl)
+                data.lvl = lvl;
         __mcip_cmd_data(CMD_IDU_SET_MODE, cmn_irq, data.word);
 }
 
@@ -240,6 +243,25 @@ static void idu_irq_unmask(struct irq_data *data)
         raw_spin_unlock_irqrestore(&mcip_lock, flags);
 }
 
+static void idu_irq_ack(struct irq_data *data)
+{
+        unsigned long flags;
+
+        raw_spin_lock_irqsave(&mcip_lock, flags);
+        __mcip_cmd(CMD_IDU_ACK_CIRQ, data->hwirq);
+        raw_spin_unlock_irqrestore(&mcip_lock, flags);
+}
+
+static void idu_irq_mask_ack(struct irq_data *data)
+{
+        unsigned long flags;
+
+        raw_spin_lock_irqsave(&mcip_lock, flags);
+        __mcip_cmd_data(CMD_IDU_SET_MASK, data->hwirq, 1);
+        __mcip_cmd(CMD_IDU_ACK_CIRQ, data->hwirq);
+        raw_spin_unlock_irqrestore(&mcip_lock, flags);
+}
+
 static int
 idu_irq_set_affinity(struct irq_data *data, const struct cpumask *cpumask,
                      bool force)
@@ -263,13 +285,36 @@ idu_irq_set_affinity(struct irq_data *data, const struct cpumask *cpumask,
         else
                 distribution_mode = IDU_M_DISTRI_RR;
 
-        idu_set_mode(data->hwirq, IDU_M_TRIG_LEVEL, distribution_mode);
+        idu_set_mode(data->hwirq, false, 0, true, distribution_mode);
 
         raw_spin_unlock_irqrestore(&mcip_lock, flags);
 
         return IRQ_SET_MASK_OK;
 }
 
+static int idu_irq_set_type(struct irq_data *data, u32 type)
+{
+        unsigned long flags;
+
+        /*
+         * ARCv2 IDU HW does not support inverse polarity, so these are the
+         * only interrupt types supported.
+         */
+        if (type & ~(IRQ_TYPE_EDGE_RISING | IRQ_TYPE_LEVEL_HIGH))
+                return -EINVAL;
+
+        raw_spin_lock_irqsave(&mcip_lock, flags);
+
+        idu_set_mode(data->hwirq, true,
+                     type & IRQ_TYPE_EDGE_RISING ? IDU_M_TRIG_EDGE :
+                                                   IDU_M_TRIG_LEVEL,
+                     false, 0);
+
+        raw_spin_unlock_irqrestore(&mcip_lock, flags);
+
+        return 0;
+}
+
 static void idu_irq_enable(struct irq_data *data)
 {
         /*
@@ -289,7 +334,10 @@ static struct irq_chip idu_irq_chip = {
         .name                   = "MCIP IDU Intc",
         .irq_mask               = idu_irq_mask,
         .irq_unmask             = idu_irq_unmask,
+        .irq_ack                = idu_irq_ack,
+        .irq_mask_ack           = idu_irq_mask_ack,
         .irq_enable             = idu_irq_enable,
+        .irq_set_type           = idu_irq_set_type,
 #ifdef CONFIG_SMP
         .irq_set_affinity       = idu_irq_set_affinity,
 #endif
@@ -317,7 +365,7 @@ static int idu_irq_map(struct irq_domain *d, unsigned int virq, irq_hw_number_t
 }
 
 static const struct irq_domain_ops idu_irq_ops = {
-        .xlate  = irq_domain_xlate_onecell,
+        .xlate  = irq_domain_xlate_onetwocell,
         .map    = idu_irq_map,
 };
 
diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c
index c2663fce7f6c..dc05a63516f5 100644
--- a/arch/arc/kernel/unwind.c
+++ b/arch/arc/kernel/unwind.c
@@ -572,6 +572,7 @@ static unsigned long read_pointer(const u8 **pLoc, const void *end,
 #else
                 BUILD_BUG_ON(sizeof(u32) != sizeof(value));
 #endif
+                /* Fall through */
         case DW_EH_PE_native:
                 if (end < (const void *)(ptr.pul + 1))
                         return 0;
@@ -826,7 +827,7 @@ static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc,
                         case DW_CFA_def_cfa:
                                 state->cfa.reg = get_uleb128(&ptr.p8, end);
                                 unw_debug("cfa_def_cfa: r%lu ", state->cfa.reg);
-                                /*nobreak*/
+                                /* fall through */
                         case DW_CFA_def_cfa_offset:
                                 state->cfa.offs = get_uleb128(&ptr.p8, end);
                                 unw_debug("cfa_def_cfa_offset: 0x%lx ",
@@ -834,7 +835,7 @@ static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc,
                                 break;
                         case DW_CFA_def_cfa_sf:
                                 state->cfa.reg = get_uleb128(&ptr.p8, end);
-                                /*nobreak */
+                                /* fall through */
                         case DW_CFA_def_cfa_offset_sf:
                                 state->cfa.offs = get_sleb128(&ptr.p8, end)
                                     * state->dataAlign;
diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c
index 62c210e7ee4c..70a3fbe79fba 100644
--- a/arch/arc/mm/dma.c
+++ b/arch/arc/mm/dma.c
@@ -101,7 +101,7 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
         if (is_isa_arcv2() && ioc_enable && coherent)
                 dev->dma_coherent = true;
 
-        dev_info(dev, "use %sncoherent DMA ops\n",
+        dev_info(dev, "use %scoherent DMA ops\n",
                  dev->dma_coherent ? "" : "non");
 }
 
diff --git a/arch/arc/plat-hsdk/platform.c b/arch/arc/plat-hsdk/platform.c
index 7dd2dd335cf6..0b961a2a10b8 100644
--- a/arch/arc/plat-hsdk/platform.c
+++ b/arch/arc/plat-hsdk/platform.c
@@ -6,11 +6,15 @@
  */
 
 #include <linux/init.h>
+#include <linux/of_fdt.h>
+#include <linux/libfdt.h>
 #include <linux/smp.h>
 #include <asm/arcregs.h>
 #include <asm/io.h>
 #include <asm/mach_desc.h>
 
+int arc_hsdk_axi_dmac_coherent __section(.data) = 0;
+
 #define ARC_CCM_UNUSED_ADDR     0x60000000
 
 static void __init hsdk_init_per_cpu(unsigned int cpu)
@@ -97,6 +101,42 @@ static void __init hsdk_enable_gpio_intc_wire(void)
         iowrite32(GPIO_INT_CONNECTED_MASK, (void __iomem *) GPIO_INTEN);
 }
 
+static int __init hsdk_tweak_node_coherency(const char *path, bool coherent)
+{
+        void *fdt = initial_boot_params;
+        const void *prop;
+        int node, ret;
+        bool dt_coh_set;
+
+        node = fdt_path_offset(fdt, path);
+        if (node < 0)
+                goto tweak_fail;
+
+        prop = fdt_getprop(fdt, node, "dma-coherent", &ret);
+        if (!prop && ret != -FDT_ERR_NOTFOUND)
+                goto tweak_fail;
+
+        dt_coh_set = ret != -FDT_ERR_NOTFOUND;
+        ret = 0;
+
+        /* need to remove "dma-coherent" property */
+        if (dt_coh_set && !coherent)
+                ret = fdt_delprop(fdt, node, "dma-coherent");
+
+        /* need to set "dma-coherent" property */
+        if (!dt_coh_set && coherent)
+                ret = fdt_setprop(fdt, node, "dma-coherent", NULL, 0);
+
+        if (ret < 0)
+                goto tweak_fail;
+
+        return 0;
+
+tweak_fail:
+        pr_err("failed to tweak %s to %scoherent\n", path, coherent ? "" : "non");
+        return -EFAULT;
+}
+
 enum hsdk_axi_masters {
         M_HS_CORE = 0,
         M_HS_RTT,
@@ -162,6 +202,39 @@ enum hsdk_axi_masters {
 #define CREG_PAE                ((void __iomem *)(CREG_BASE + 0x180))
 #define CREG_PAE_UPDT           ((void __iomem *)(CREG_BASE + 0x194))
 
+static void __init hsdk_init_memory_bridge_axi_dmac(void)
+{
+        bool coherent = !!arc_hsdk_axi_dmac_coherent;
+        u32 axi_m_slv1, axi_m_oft1;
+
+        /*
+         * Don't tweak memory bridge configuration if we failed to tweak DTB
+         * as we will end up in a inconsistent state.
+         */
+        if (hsdk_tweak_node_coherency("/soc/dmac@80000", coherent))
+                return;
+
+        if (coherent) {
+                axi_m_slv1 = 0x77999999;
+                axi_m_oft1 = 0x76DCBA98;
+        } else {
+                axi_m_slv1 = 0x77777777;
+                axi_m_oft1 = 0x76543210;
+        }
+
+        writel(0x77777777, CREG_AXI_M_SLV0(M_DMAC_0));
+        writel(0xFEDCBA98, CREG_AXI_M_OFT0(M_DMAC_0));
+        writel(axi_m_slv1, CREG_AXI_M_SLV1(M_DMAC_0));
+        writel(axi_m_oft1, CREG_AXI_M_OFT1(M_DMAC_0));
+        writel(UPDATE_VAL, CREG_AXI_M_UPDT(M_DMAC_0));
+
+        writel(0x77777777, CREG_AXI_M_SLV0(M_DMAC_1));
+        writel(0xFEDCBA98, CREG_AXI_M_OFT0(M_DMAC_1));
+        writel(axi_m_slv1, CREG_AXI_M_SLV1(M_DMAC_1));
+        writel(axi_m_oft1, CREG_AXI_M_OFT1(M_DMAC_1));
+        writel(UPDATE_VAL, CREG_AXI_M_UPDT(M_DMAC_1));
+}
+
 static void __init hsdk_init_memory_bridge(void)
 {
         u32 reg;
@@ -227,24 +300,14 @@ static void __init hsdk_init_memory_bridge(void)
         writel(0x76543210, CREG_AXI_M_OFT1(M_GPU));
         writel(UPDATE_VAL, CREG_AXI_M_UPDT(M_GPU));
 
-        writel(0x77777777, CREG_AXI_M_SLV0(M_DMAC_0));
-        writel(0x77777777, CREG_AXI_M_SLV1(M_DMAC_0));
-        writel(0xFEDCBA98, CREG_AXI_M_OFT0(M_DMAC_0));
-        writel(0x76543210, CREG_AXI_M_OFT1(M_DMAC_0));
-        writel(UPDATE_VAL, CREG_AXI_M_UPDT(M_DMAC_0));
-
-        writel(0x77777777, CREG_AXI_M_SLV0(M_DMAC_1));
-        writel(0x77777777, CREG_AXI_M_SLV1(M_DMAC_1));
-        writel(0xFEDCBA98, CREG_AXI_M_OFT0(M_DMAC_1));
-        writel(0x76543210, CREG_AXI_M_OFT1(M_DMAC_1));
-        writel(UPDATE_VAL, CREG_AXI_M_UPDT(M_DMAC_1));
-
         writel(0x00000000, CREG_AXI_M_SLV0(M_DVFS));
         writel(0x60000000, CREG_AXI_M_SLV1(M_DVFS));
         writel(0x00000000, CREG_AXI_M_OFT0(M_DVFS));
         writel(0x00000000, CREG_AXI_M_OFT1(M_DVFS));
         writel(UPDATE_VAL, CREG_AXI_M_UPDT(M_DVFS));
 
+        hsdk_init_memory_bridge_axi_dmac();
+
         /*
          * PAE remapping for DMA clients does not work due to an RTL bug, so
          * CREG_PAE register must be programmed to all zeroes, otherwise it
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 33b00579beff..24360211534a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -7,6 +7,8 @@ config ARM
         select ARCH_HAS_BINFMT_FLAT
         select ARCH_HAS_DEBUG_VIRTUAL if MMU
         select ARCH_HAS_DEVMEM_IS_ALLOWED
+        select ARCH_HAS_DMA_COHERENT_TO_PFN if SWIOTLB
+        select ARCH_HAS_DMA_MMAP_PGPROT if SWIOTLB
         select ARCH_HAS_ELF_RANDOMIZE
         select ARCH_HAS_FORTIFY_SOURCE
         select ARCH_HAS_KEEPINITRD
@@ -18,6 +20,8 @@ config ARM
         select ARCH_HAS_SET_MEMORY
         select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL
         select ARCH_HAS_STRICT_MODULE_RWX if MMU
+        select ARCH_HAS_SYNC_DMA_FOR_DEVICE if SWIOTLB
+        select ARCH_HAS_SYNC_DMA_FOR_CPU if SWIOTLB
         select ARCH_HAS_TEARDOWN_DMA_OPS if MMU
         select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
         select ARCH_HAVE_CUSTOM_GPIO_H
diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
index ced1a19d5f89..46849d6ecb3e 100644
--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -185,7 +185,7 @@
                         uart0: serial@0 {
                                 compatible = "ti,am3352-uart", "ti,omap3-uart";
                                 clock-frequency = <48000000>;
-                                reg = <0x0 0x2000>;
+                                reg = <0x0 0x1000>;
                                 interrupts = <72>;
                                 status = "disabled";
                                 dmas = <&edma 26 0>, <&edma 27 0>;
@@ -934,7 +934,7 @@
                         uart1: serial@0 {
                                 compatible = "ti,am3352-uart", "ti,omap3-uart";
                                 clock-frequency = <48000000>;
-                                reg = <0x0 0x2000>;
+                                reg = <0x0 0x1000>;
                                 interrupts = <73>;
                                 status = "disabled";
                                 dmas = <&edma 28 0>, <&edma 29 0>;
@@ -966,7 +966,7 @@
                         uart2: serial@0 {
                                 compatible = "ti,am3352-uart", "ti,omap3-uart";
                                 clock-frequency = <48000000>;
-                                reg = <0x0 0x2000>;
+                                reg = <0x0 0x1000>;
                                 interrupts = <74>;
                                 status = "disabled";
                                 dmas = <&edma 30 0>, <&edma 31 0>;
@@ -1614,7 +1614,7 @@
                         uart3: serial@0 {
                                 compatible = "ti,am3352-uart", "ti,omap3-uart";
                                 clock-frequency = <48000000>;
-                                reg = <0x0 0x2000>;
+                                reg = <0x0 0x1000>;
                                 interrupts = <44>;
                                 status = "disabled";
                         };
@@ -1644,7 +1644,7 @@
                         uart4: serial@0 {
                                 compatible = "ti,am3352-uart", "ti,omap3-uart";
                                 clock-frequency = <48000000>;
-                                reg = <0x0 0x2000>;
+                                reg = <0x0 0x1000>;
                                 interrupts = <45>;
                                 status = "disabled";
                         };
@@ -1674,7 +1674,7 @@
                         uart5: serial@0 {
                                 compatible = "ti,am3352-uart", "ti,omap3-uart";
                                 clock-frequency = <48000000>;
-                                reg = <0x0 0x2000>;
+                                reg = <0x0 0x1000>;
                                 interrupts = <46>;
                                 status = "disabled";
                         };
@@ -1758,6 +1758,8 @@
 
                 target-module@cc000 {                   /* 0x481cc000, ap 60 46.0 */
                         compatible = "ti,sysc-omap4", "ti,sysc";
+                        reg = <0xcc020 0x4>;
+                        reg-names = "rev";
                         ti,hwmods = "d_can0";
                         /* Domains (P, C): per_pwrdm, l4ls_clkdm */
                         clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>,
@@ -1780,6 +1782,8 @@
 
                 target-module@d0000 {                   /* 0x481d0000, ap 62 42.0 */
                         compatible = "ti,sysc-omap4", "ti,sysc";
+                        reg = <0xd0020 0x4>;
+                        reg-names = "rev";
                         ti,hwmods = "d_can1";
                         /* Domains (P, C): per_pwrdm, l4ls_clkdm */
                         clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>,
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index e5c2f71a7c77..fb6b8aa12cc5 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -234,13 +234,33 @@
                         interrupt-names = "edma3_tcerrint";
                 };
 
-                mmc3: mmc@47810000 {
-                        compatible = "ti,omap4-hsmmc";
+                target-module@47810000 {
+                        compatible = "ti,sysc-omap2", "ti,sysc";
                         ti,hwmods = "mmc3";
-                        ti,needs-special-reset;
-                        interrupts = <29>;
-                        reg = <0x47810000 0x1000>;
-                        status = "disabled";
+                        reg = <0x478102fc 0x4>,
+                              <0x47810110 0x4>,
+                              <0x47810114 0x4>;
+                        reg-names = "rev", "sysc", "syss";
+                        ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
+                                         SYSC_OMAP2_ENAWAKEUP |
+                                         SYSC_OMAP2_SOFTRESET |
+                                         SYSC_OMAP2_AUTOIDLE)>;
+                        ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+                                        <SYSC_IDLE_NO>,
+                                        <SYSC_IDLE_SMART>;
+                        ti,syss-mask = <1>;
+                        clocks = <&l3s_clkctrl AM3_L3S_MMC3_CLKCTRL 0>;
+                        clock-names = "fck";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0x0 0x47810000 0x1000>;
+
+                        mmc3: mmc@0 {
+                                compatible = "ti,omap4-hsmmc";
+                                ti,needs-special-reset;
+                                interrupts = <29>;
+                                reg = <0x0 0x1000>;
+                        };
                 };
 
                 usb: usb@47400000 {
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 55aff4db9c7c..848e2a8884e2 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -228,13 +228,33 @@
                         interrupt-names = "edma3_tcerrint";
                 };
 
-                mmc3: mmc@47810000 {
-                        compatible = "ti,omap4-hsmmc";
-                        reg = <0x47810000 0x1000>;
+                target-module@47810000 {
+                        compatible = "ti,sysc-omap2", "ti,sysc";
                         ti,hwmods = "mmc3";
-                        ti,needs-special-reset;
-                        interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
-                        status = "disabled";
+                        reg = <0x478102fc 0x4>,
+                              <0x47810110 0x4>,
+                              <0x47810114 0x4>;
+                        reg-names = "rev", "sysc", "syss";
+                        ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
+                                         SYSC_OMAP2_ENAWAKEUP |
+                                         SYSC_OMAP2_SOFTRESET |
+                                         SYSC_OMAP2_AUTOIDLE)>;
+                        ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+                                        <SYSC_IDLE_NO>,
+                                        <SYSC_IDLE_SMART>;
+                        ti,syss-mask = <1>;
+                        clocks = <&l3s_clkctrl AM4_L3S_MMC3_CLKCTRL 0>;
+                        clock-names = "fck";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0x0 0x47810000 0x1000>;
+
+                        mmc3: mmc@0 {
+                                compatible = "ti,omap4-hsmmc";
+                                ti,needs-special-reset;
+                                interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+                                reg = <0x0 0x1000>;
+                        };
                 };
 
                 sham: sham@53100000 {
diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
index 989cb60b9029..04bee4ff9dcb 100644
--- a/arch/arm/boot/dts/am437x-l4.dtsi
+++ b/arch/arm/boot/dts/am437x-l4.dtsi
@@ -1574,6 +1574,8 @@
 
                 target-module@cc000 {                   /* 0x481cc000, ap 50 46.0 */
                         compatible = "ti,sysc-omap4", "ti,sysc";
+                        reg = <0xcc020 0x4>;
+                        reg-names = "rev";
                         ti,hwmods = "d_can0";
                         /* Domains (P, C): per_pwrdm, l4ls_clkdm */
                         clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN0_CLKCTRL 0>;
@@ -1593,6 +1595,8 @@
 
                 target-module@d0000 {                   /* 0x481d0000, ap 52 3a.0 */
                         compatible = "ti,sysc-omap4", "ti,sysc";
+                        reg = <0xd0020 0x4>;
+                        reg-names = "rev";
                         ti,hwmods = "d_can1";
                         /* Domains (P, C): per_pwrdm, l4ls_clkdm */
                         clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN1_CLKCTRL 0>;
diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index 1d5e99964bbf..0aaacea1d887 100644
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -175,14 +175,9 @@
 };
 
 &mmc1 {
-        pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104";
+        pinctrl-names = "default", "hs";
         pinctrl-0 = <&mmc1_pins_default_no_clk_pu>;
         pinctrl-1 = <&mmc1_pins_hs>;
-        pinctrl-2 = <&mmc1_pins_sdr12>;
-        pinctrl-3 = <&mmc1_pins_sdr25>;
-        pinctrl-4 = <&mmc1_pins_sdr50>;
-        pinctrl-5 = <&mmc1_pins_ddr50_rev20 &mmc1_iodelay_ddr50_conf>;
-        pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>;
 };
 
 &mmc2 {
diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts
index c65d7f6d3b5a..ea1c119feaa5 100644
--- a/arch/arm/boot/dts/am572x-idk.dts
+++ b/arch/arm/boot/dts/am572x-idk.dts
@@ -16,14 +16,9 @@
 };
 
 &mmc1 {
-        pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104";
+        pinctrl-names = "default", "hs";
         pinctrl-0 = <&mmc1_pins_default_no_clk_pu>;
         pinctrl-1 = <&mmc1_pins_hs>;
-        pinctrl-2 = <&mmc1_pins_sdr12>;
-        pinctrl-3 = <&mmc1_pins_sdr25>;
-        pinctrl-4 = <&mmc1_pins_sdr50>;
-        pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev20_conf>;
-        pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>;
 };
 
 &mmc2 {
diff --git a/arch/arm/boot/dts/am574x-idk.dts b/arch/arm/boot/dts/am574x-idk.dts
index dc5141c35610..7935d70874ce 100644
--- a/arch/arm/boot/dts/am574x-idk.dts
+++ b/arch/arm/boot/dts/am574x-idk.dts
@@ -24,14 +24,9 @@
 };
 
 &mmc1 {
-        pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104";
+        pinctrl-names = "default", "hs";
         pinctrl-0 = <&mmc1_pins_default_no_clk_pu>;
         pinctrl-1 = <&mmc1_pins_hs>;
-        pinctrl-2 = <&mmc1_pins_default>;
-        pinctrl-3 = <&mmc1_pins_hs>;
-        pinctrl-4 = <&mmc1_pins_sdr50>;
-        pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_conf>;
-        pinctrl-6 = <&mmc1_pins_ddr50 &mmc1_iodelay_sdr104_conf>;
 };
 
 &mmc2 {
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index d02f5fa61e5f..bc76f1705c0f 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -379,7 +379,7 @@
         };
 };
 
-&gpio7 {
+&gpio7_target {
         ti,no-reset-on-init;
         ti,no-idle-on-init;
 };
@@ -430,6 +430,7 @@
 
         bus-width = <4>;
         cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */
+        no-1-8-v;
 };
 
 &mmc2 {
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts
index a374b5cd6db0..7b113b52c3fb 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts
@@ -16,14 +16,9 @@
 };
 
 &mmc1 {
-        pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104";
+        pinctrl-names = "default", "hs";
         pinctrl-0 = <&mmc1_pins_default>;
         pinctrl-1 = <&mmc1_pins_hs>;
-        pinctrl-2 = <&mmc1_pins_sdr12>;
-        pinctrl-3 = <&mmc1_pins_sdr25>;
-        pinctrl-4 = <&mmc1_pins_sdr50>;
-        pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev11_conf>;
-        pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev11_conf>;
         vmmc-supply = <&vdd_3v3>;
         vqmmc-supply = <&ldo1_reg>;
 };
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-revc.dts b/arch/arm/boot/dts/am57xx-beagle-x15-revc.dts
index 4badd2144db9..30c500b15b21 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-revc.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-revc.dts
@@ -16,14 +16,9 @@
 };
 
 &mmc1 {
-        pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104";
+        pinctrl-names = "default", "hs";
         pinctrl-0 = <&mmc1_pins_default>;
         pinctrl-1 = <&mmc1_pins_hs>;
-        pinctrl-2 = <&mmc1_pins_sdr12>;
-        pinctrl-3 = <&mmc1_pins_sdr25>;
-        pinctrl-4 = <&mmc1_pins_sdr50>;
-        pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev20_conf>;
-        pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>;
         vmmc-supply = <&vdd_3v3>;
         vqmmc-supply = <&ldo1_reg>;
 };
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 714e971b912a..de7f85efaa51 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -498,7 +498,7 @@
         phy-supply = <&ldousb_reg>;
 };
 
-&gpio7 {
+&gpio7_target {
         ti,no-reset-on-init;
         ti,no-idle-on-init;
 };
diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi
index 23faedec08ab..21e5914fdd62 100644
--- a/arch/arm/boot/dts/dra7-l4.dtsi
+++ b/arch/arm/boot/dts/dra7-l4.dtsi
@@ -1261,7 +1261,7 @@
                         };
                 };
 
-                target-module@51000 {                   /* 0x48051000, ap 45 2e.0 */
+                gpio7_target: target-module@51000 {             /* 0x48051000, ap 45 2e.0 */
                         compatible = "ti,sysc-omap2", "ti,sysc";
                         ti,hwmods = "gpio7";
                         reg = <0x51000 0x4>,
@@ -3025,7 +3025,7 @@
 
                 target-module@80000 {                   /* 0x48480000, ap 31 16.0 */
                         compatible = "ti,sysc-omap4", "ti,sysc";
-                        reg = <0x80000 0x4>;
+                        reg = <0x80020 0x4>;
                         reg-names = "rev";
                         clocks = <&l4per2_clkctrl DRA7_L4PER2_DCAN2_CLKCTRL 0>;
                         clock-names = "fck";
@@ -4577,7 +4577,7 @@
 
                 target-module@c000 {                    /* 0x4ae3c000, ap 30 04.0 */
                         compatible = "ti,sysc-omap4", "ti,sysc";
-                        reg = <0xc000 0x4>;
+                        reg = <0xc020 0x4>;
                         reg-names = "rev";
                         clocks = <&wkupaon_clkctrl DRA7_WKUPAON_DCAN1_CLKCTRL 0>;
                         clock-names = "fck";
diff --git a/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi b/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi
index 28ebb4eb884a..214b9e6de2c3 100644
--- a/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi
+++ b/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi
@@ -32,7 +32,7 @@
  *
  * Datamanual Revisions:
  *
- * AM572x Silicon Revision 2.0: SPRS953B, Revised November 2016
+ * AM572x Silicon Revision 2.0: SPRS953F, Revised May 2019
  * AM572x Silicon Revision 1.1: SPRS915R, Revised November 2016
  *
  */
@@ -229,45 +229,45 @@
 
         mmc3_pins_default: mmc3_pins_default {
                 pinctrl-single,pins = <
-                        DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_clk.mmc3_clk */
-                        DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */
-                        DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */
-                        DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */
-                        DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */
-                        DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */
+                        DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_clk.mmc3_clk */
+                        DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */
+                        DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */
+                        DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */
+                        DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */
+                        DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */
                 >;
         };
 
         mmc3_pins_hs: mmc3_pins_hs {
                 pinctrl-single,pins = <
-                        DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_clk.mmc3_clk */
-                        DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */
-                        DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */
-                        DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */
-                        DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */
-                        DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */
+                        DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_clk.mmc3_clk */
+                        DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */
+                        DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */
+                        DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */
+                        DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */
+                        DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */
                 >;
         };
 
         mmc3_pins_sdr12: mmc3_pins_sdr12 {
                 pinctrl-single,pins = <
-                        DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_clk.mmc3_clk */
-                        DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */
-                        DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */
-                        DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */
-                        DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */
-                        DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */
+                        DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_clk.mmc3_clk */
+                        DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */
+                        DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */
+                        DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */
+                        DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */
+                        DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */
                 >;
         };
 
         mmc3_pins_sdr25: mmc3_pins_sdr25 {
                 pinctrl-single,pins = <
-                        DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_clk.mmc3_clk */
-                        DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */
-                        DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */
-                        DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */
-                        DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */
-                        DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */
+                        DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_clk.mmc3_clk */
+                        DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */
+                        DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */
+                        DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */
+                        DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */
+                        DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */
                 >;
         };
 
diff --git a/arch/arm/boot/dts/vf610-bk4.dts b/arch/arm/boot/dts/vf610-bk4.dts
index 3fa0cbe456db..0f3870d3b099 100644
--- a/arch/arm/boot/dts/vf610-bk4.dts
+++ b/arch/arm/boot/dts/vf610-bk4.dts
@@ -246,13 +246,13 @@
                 reg = <0>;
         };
 
-        n25q128a13_2: flash@1 {
+        n25q128a13_2: flash@2 {
                 compatible = "n25q128a13", "jedec,spi-nor";
                 #address-cells = <1>;
                 #size-cells = <1>;
                 spi-max-frequency = <66000000>;
                 spi-rx-bus-width = <2>;
-                reg = <1>;
+                reg = <2>;
         };
 };
 
diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S
index 1d5210eb4776..582925238d65 100644
--- a/arch/arm/lib/backtrace.S
+++ b/arch/arm/lib/backtrace.S
@@ -66,7 +66,7 @@ for_each_frame:	tst	frame, mask		@ Check for address exceptions
 
 1003:           ldr     r2, [sv_pc, #-4]        @ if stmfd sp!, {args} exists,
                 ldr     r3, .Ldsi+4             @ adjust saved 'pc' back one
-                teq     r3, r2, lsr #10         @ instruction
+                teq     r3, r2, lsr #11         @ instruction
                 subne   r0, sv_pc, #4           @ allow for mov
                 subeq   r0, sv_pc, #8           @ allow for mov + stmia
 
diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S
index 81159af44862..14a6c3eb3298 100644
--- a/arch/arm/mach-omap1/ams-delta-fiq-handler.S
+++ b/arch/arm/mach-omap1/ams-delta-fiq-handler.S
@@ -126,6 +126,8 @@ restart:
         orr r11, r11, r13                       @ mask all requested interrupts
         str r11, [r12, #OMAP1510_GPIO_INT_MASK]
 
+        str r13, [r12, #OMAP1510_GPIO_INT_STATUS] @ ack all requested interrupts
+
         ands r10, r13, #KEYBRD_CLK_MASK         @ extract keyboard status - set?
         beq hksw                                @ no - try next source
 
@@ -133,7 +135,6 @@ restart:
         @@@@@@@@@@@@@@@@@@@@@@
         @ Keyboard clock FIQ mode interrupt handler
         @ r10 now contains KEYBRD_CLK_MASK, use it
-        str r10, [r12, #OMAP1510_GPIO_INT_STATUS]       @ ack the interrupt
         bic r11, r11, r10                               @ unmask it
         str r11, [r12, #OMAP1510_GPIO_INT_MASK]
 
diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c
index 43899fa56674..0254eb9cf8c6 100644
--- a/arch/arm/mach-omap1/ams-delta-fiq.c
+++ b/arch/arm/mach-omap1/ams-delta-fiq.c
@@ -70,9 +70,7 @@ static irqreturn_t deferred_fiq(int irq, void *dev_id)
                          * interrupts default to since commit 80ac93c27441
                          * requires interrupt already acked and unmasked.
                          */
-                        if (irq_chip->irq_ack)
-                                irq_chip->irq_ack(d);
-                        if (irq_chip->irq_unmask)
+                        if (!WARN_ON_ONCE(!irq_chip->irq_unmask))
                                 irq_chip->irq_unmask(d);
                 }
                 for (; irq_counter[gpio] < fiq_count; irq_counter[gpio]++)
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 600650551621..d4f11c5070ae 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -229,3 +229,5 @@ include/generated/ti-pm-asm-offsets.h: arch/arm/mach-omap2/pm-asm-offsets.s FORC
 $(obj)/sleep33xx.o $(obj)/sleep43xx.o: include/generated/ti-pm-asm-offsets.h
 
 targets += pm-asm-offsets.s
+
+obj-$(CONFIG_OMAP_IOMMU)                += omap-iommu.o
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
new file mode 100644
index 000000000000..f1a6ece8108e
--- /dev/null
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * OMAP IOMMU quirks for various TI SoCs
+ *
+ * Copyright (C) 2015-2019 Texas Instruments Incorporated - http://www.ti.com/
+ *      Suman Anna <s-anna@ti.com>
+ */
+
+#include <linux/platform_device.h>
+#include <linux/err.h>
+
+#include "omap_hwmod.h"
+#include "omap_device.h"
+#include "powerdomain.h"
+
+int omap_iommu_set_pwrdm_constraint(struct platform_device *pdev, bool request,
+                                    u8 *pwrst)
+{
+        struct powerdomain *pwrdm;
+        struct omap_device *od;
+        u8 next_pwrst;
+
+        od = to_omap_device(pdev);
+        if (!od)
+                return -ENODEV;
+
+        if (od->hwmods_cnt != 1)
+                return -EINVAL;
+
+        pwrdm = omap_hwmod_get_pwrdm(od->hwmods[0]);
+        if (!pwrdm)
+                return -EINVAL;
+
+        if (request)
+                *pwrst = pwrdm_read_next_pwrst(pwrdm);
+
+        if (*pwrst > PWRDM_POWER_RET)
+                return 0;
+
+        next_pwrst = request ? PWRDM_POWER_ON : *pwrst;
+
+        return pwrdm_set_next_pwrst(pwrdm, next_pwrst);
+}
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index f9c02f9f1c92..5c3845730dbf 100644
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -127,6 +127,9 @@ static int __init omap4_sram_init(void)
         struct device_node *np;
         struct gen_pool *sram_pool;
 
+        if (!soc_is_omap44xx() && !soc_is_omap54xx())
+                return 0;
+
         np = of_find_compatible_node(NULL, NULL, "ti,omap4-mpu");
         if (!np)
                 pr_warn("%s:Unable to allocate sram needed to handle errata I688\n",
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index 4a5b4aee6615..1ec21e9ba1e9 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -379,7 +379,8 @@ static struct omap_hwmod dra7xx_dcan2_hwmod = {
 static struct omap_hwmod_class_sysconfig dra7xx_epwmss_sysc = {
         .rev_offs       = 0x0,
         .sysc_offs      = 0x4,
-        .sysc_flags     = SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET,
+        .sysc_flags     = SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
+                          SYSC_HAS_RESET_STATUS,
         .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
         .sysc_fields    = &omap_hwmod_sysc_type2,
 };
diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c
index 0ce56ad754ce..ea2c84214bac 100644
--- a/arch/arm/mach-rpc/riscpc.c
+++ b/arch/arm/mach-rpc/riscpc.c
@@ -46,6 +46,7 @@ static int __init parse_tag_acorn(const struct tag *tag)
         switch (tag->u.acorn.vram_pages) {
         case 512:
                 vram_size += PAGE_SIZE * 256;
+                /* Fall through - ??? */
         case 256:
                 vram_size += PAGE_SIZE * 256;
         default:
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index c54cd7ed90ba..c1222c0e9fd3 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -664,10 +664,6 @@ config ARM_LPAE
                 !CPU_32v4 && !CPU_32v3
         select PHYS_ADDR_T_64BIT
         select SWIOTLB
-        select ARCH_HAS_DMA_COHERENT_TO_PFN
-        select ARCH_HAS_DMA_MMAP_PGPROT
-        select ARCH_HAS_SYNC_DMA_FOR_DEVICE
-        select ARCH_HAS_SYNC_DMA_FOR_CPU
         help
           Say Y if you have an ARMv7 processor supporting the LPAE page
           table format and you would like to access memory beyond the
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 16d373d587c4..b4be3baa83d4 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -175,6 +175,11 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max_low,
 #ifdef CONFIG_HAVE_ARCH_PFN_VALID
 int pfn_valid(unsigned long pfn)
 {
+        phys_addr_t addr = __pfn_to_phys(pfn);
+
+        if (__phys_to_pfn(addr) != pfn)
+                return 0;
+
         return memblock_is_map_memory(__pfn_to_phys(pfn));
 }
 EXPORT_SYMBOL(pfn_valid);
@@ -628,7 +633,8 @@ static void update_sections_early(struct section_perm perms[], int n)
                 if (t->flags & PF_KTHREAD)
                         continue;
                 for_each_thread(t, s)
-                        set_section_perms(perms, n, true, s->mm);
+                        if (s->mm)
+                                set_section_perms(perms, n, true, s->mm);
         }
         set_section_perms(perms, n, true, current->active_mm);
         set_section_perms(perms, n, true, &init_mm);
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
index c7a87368850b..12aa7eaeaf68 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
@@ -339,6 +339,12 @@
         pinctrl-names = "default";
 };
 
+&ir {
+        status = "okay";
+        pinctrl-0 = <&remote_input_ao_pins>;
+        pinctrl-names = "default";
+};
+
 &pwm_ef {
         status = "okay";
         pinctrl-0 = <&pwm_e_pins>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
index f8d43e3dcf20..1785552d450c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
@@ -2386,6 +2386,7 @@
                                 clocks = <&clkc CLKID_USB1_DDR_BRIDGE>;
                                 clock-names = "ddr";
                                 phys = <&usb2_phy1>;
+                                phy-names = "usb2-phy";
                                 dr_mode = "peripheral";
                                 g-rx-fifo-size = <192>;
                                 g-np-tx-fifo-size = <128>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
index 81780ffcc7f0..4e916e1f71f7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
@@ -53,6 +53,7 @@
 
                 gpio = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;
                 enable-active-high;
+                regulator-always-on;
         };
 
         tf_io: gpio-regulator-tf_io {
diff --git a/arch/arm64/boot/dts/renesas/hihope-common.dtsi b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
index 3311a982fff8..23fd0224ca90 100644
--- a/arch/arm64/boot/dts/renesas/hihope-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
@@ -279,6 +279,7 @@
         mmc-hs200-1_8v;
         non-removable;
         fixed-emmc-driver-type = <1>;
+        status = "okay";
 };
 
 &usb_extal_clk {
diff --git a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts
index 0711170b26b1..3aa2564dfdc2 100644
--- a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts
@@ -97,7 +97,7 @@
                 reg = <0x0 0x48000000 0x0 0x18000000>;
         };
 
-        reg_1p8v: regulator0 {
+        reg_1p8v: regulator-1p8v {
                 compatible = "regulator-fixed";
                 regulator-name = "fixed-1.8V";
                 regulator-min-microvolt = <1800000>;
@@ -106,7 +106,7 @@
                 regulator-always-on;
         };
 
-        reg_3p3v: regulator1 {
+        reg_3p3v: regulator-3p3v {
                 compatible = "regulator-fixed";
                 regulator-name = "fixed-3.3V";
                 regulator-min-microvolt = <3300000>;
@@ -115,7 +115,7 @@
                 regulator-always-on;
         };
 
-        reg_12p0v: regulator1 {
+        reg_12p0v: regulator-12p0v {
                 compatible = "regulator-fixed";
                 regulator-name = "D12.0V";
                 regulator-min-microvolt = <12000000>;
diff --git a/arch/ia64/include/asm/iommu.h b/arch/ia64/include/asm/iommu.h
index 7429a72f3f92..92aceef63710 100644
--- a/arch/ia64/include/asm/iommu.h
+++ b/arch/ia64/include/asm/iommu.h
@@ -8,10 +8,8 @@
 extern void no_iommu_init(void);
 #ifdef  CONFIG_INTEL_IOMMU
 extern int force_iommu, no_iommu;
-extern int iommu_pass_through;
 extern int iommu_detected;
 #else
-#define iommu_pass_through      (0)
 #define no_iommu                (1)
 #define iommu_detected          (0)
 #endif
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
index fe988c49f01c..f5d49cd3fbb0 100644
--- a/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c
@@ -22,8 +22,6 @@ int force_iommu __read_mostly = 1;
 int force_iommu __read_mostly;
 #endif
 
-int iommu_pass_through;
-
 static int __init pci_iommu_init(void)
 {
         if (iommu_detected)
diff --git a/arch/mips/include/asm/octeon/cvmx-sli-defs.h b/arch/mips/include/asm/octeon/cvmx-sli-defs.h
index 52cf96ea43e5..cbc7cdae1c6a 100644
--- a/arch/mips/include/asm/octeon/cvmx-sli-defs.h
+++ b/arch/mips/include/asm/octeon/cvmx-sli-defs.h
@@ -46,6 +46,7 @@ static inline uint64_t CVMX_SLI_PCIE_MSI_RCV_FUNC(void)
         case OCTEON_CN78XX & OCTEON_FAMILY_MASK:
                 if (OCTEON_IS_MODEL(OCTEON_CN78XX_PASS1_X))
                         return 0x0000000000003CB0ull;
+                /* Else, fall through */
         default:
                 return 0x0000000000023CB0ull;
         }
diff --git a/arch/nds32/kernel/signal.c b/arch/nds32/kernel/signal.c
index fe61513982b4..330b19fcd990 100644
--- a/arch/nds32/kernel/signal.c
+++ b/arch/nds32/kernel/signal.c
@@ -316,6 +316,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
                                 regs->uregs[0] = -EINTR;
                                 break;
                         }
+                        /* Else, fall through */
                 case -ERESTARTNOINTR:
                         regs->uregs[0] = regs->orig_r0;
                         regs->ipc -= 4;
@@ -360,6 +361,7 @@ static void do_signal(struct pt_regs *regs)
                 switch (regs->uregs[0]) {
                 case -ERESTART_RESTARTBLOCK:
                         regs->uregs[15] = __NR_restart_syscall;
+                        /* Fall through */
                 case -ERESTARTNOHAND:
                 case -ERESTARTSYS:
                 case -ERESTARTNOINTR:
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
index a39b079e73f2..6d58c1739b42 100644
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -2,6 +2,7 @@
 #ifndef _PARISC_PGTABLE_H
 #define _PARISC_PGTABLE_H
 
+#include <asm/page.h>
 #include <asm-generic/4level-fixup.h>
 
 #include <asm/fixmap.h>
@@ -98,8 +99,6 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
 
 #endif /* !__ASSEMBLY__ */
 
-#include <asm/page.h>
-
 #define pte_ERROR(e) \
         printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
 #define pmd_ERROR(e) \
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 8fc4de0d22b4..7a84c9f1778e 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -101,21 +101,8 @@ static void check_if_tm_restore_required(struct task_struct *tsk)
         }
 }
 
-static bool tm_active_with_fp(struct task_struct *tsk)
-{
-        return MSR_TM_ACTIVE(tsk->thread.regs->msr) &&
-                (tsk->thread.ckpt_regs.msr & MSR_FP);
-}
-
-static bool tm_active_with_altivec(struct task_struct *tsk)
-{
-        return MSR_TM_ACTIVE(tsk->thread.regs->msr) &&
-                (tsk->thread.ckpt_regs.msr & MSR_VEC);
-}
 #else
 static inline void check_if_tm_restore_required(struct task_struct *tsk) { }
-static inline bool tm_active_with_fp(struct task_struct *tsk) { return false; }
-static inline bool tm_active_with_altivec(struct task_struct *tsk) { return false; }
 #endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
 
 bool strict_msr_control;
@@ -252,7 +239,7 @@ EXPORT_SYMBOL(enable_kernel_fp);
 
 static int restore_fp(struct task_struct *tsk)
 {
-        if (tsk->thread.load_fp || tm_active_with_fp(tsk)) {
+        if (tsk->thread.load_fp) {
                 load_fp_state(&current->thread.fp_state);
                 current->thread.load_fp++;
                 return 1;
@@ -334,8 +321,7 @@ EXPORT_SYMBOL_GPL(flush_altivec_to_thread);
 
 static int restore_altivec(struct task_struct *tsk)
 {
-        if (cpu_has_feature(CPU_FTR_ALTIVEC) &&
-                (tsk->thread.load_vec || tm_active_with_altivec(tsk))) {
+        if (cpu_has_feature(CPU_FTR_ALTIVEC) && (tsk->thread.load_vec)) {
                 load_vr_state(&tsk->thread.vr_state);
                 tsk->thread.used_vr = 1;
                 tsk->thread.load_vec++;
@@ -497,13 +483,14 @@ void giveup_all(struct task_struct *tsk)
         if (!tsk->thread.regs)
                 return;
 
+        check_if_tm_restore_required(tsk);
+
         usermsr = tsk->thread.regs->msr;
 
         if ((usermsr & msr_all_available) == 0)
                 return;
 
         msr_check_and_set(msr_all_available);
-        check_if_tm_restore_required(tsk);
 
         WARN_ON((usermsr & MSR_VSX) && !((usermsr & MSR_FP) && (usermsr & MSR_VEC)));
 
diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c
index e99a14798ab0..c4b606fe73eb 100644
--- a/arch/powerpc/kvm/book3s_64_vio.c
+++ b/arch/powerpc/kvm/book3s_64_vio.c
@@ -660,8 +660,10 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu,
                 }
                 tce = be64_to_cpu(tce);
 
-                if (kvmppc_tce_to_ua(vcpu->kvm, tce, &ua))
-                        return H_PARAMETER;
+                if (kvmppc_tce_to_ua(vcpu->kvm, tce, &ua)) {
+                        ret = H_PARAMETER;
+                        goto unlock_exit;
+                }
 
                 list_for_each_entry_lockless(stit, &stt->iommu_tables, next) {
                         ret = kvmppc_tce_iommu_map(vcpu->kvm, stt,
diff --git a/arch/powerpc/kvm/book3s_64_vio_hv.c b/arch/powerpc/kvm/book3s_64_vio_hv.c
index f50bbeedfc66..b4f20f13b860 100644
--- a/arch/powerpc/kvm/book3s_64_vio_hv.c
+++ b/arch/powerpc/kvm/book3s_64_vio_hv.c
@@ -556,8 +556,10 @@ long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu,
                 unsigned long tce = be64_to_cpu(((u64 *)tces)[i]);
 
                 ua = 0;
-                if (kvmppc_rm_tce_to_ua(vcpu->kvm, tce, &ua, NULL))
-                        return H_PARAMETER;
+                if (kvmppc_rm_tce_to_ua(vcpu->kvm, tce, &ua, NULL)) {
+                        ret = H_PARAMETER;
+                        goto unlock_exit;
+                }
 
                 list_for_each_entry_lockless(stit, &stt->iommu_tables, next) {
                         ret = kvmppc_rm_tce_iommu_map(vcpu->kvm, stt,
diff --git a/arch/powerpc/mm/nohash/tlb.c b/arch/powerpc/mm/nohash/tlb.c
index d4acf6fa0596..bf60983a58c7 100644
--- a/arch/powerpc/mm/nohash/tlb.c
+++ b/arch/powerpc/mm/nohash/tlb.c
@@ -630,7 +630,6 @@ static void early_init_this_mmu(void)
 #ifdef CONFIG_PPC_FSL_BOOK3E
         if (mmu_has_feature(MMU_FTR_TYPE_FSL_E)) {
                 unsigned int num_cams;
-                int __maybe_unused cpu = smp_processor_id();
                 bool map = true;
 
                 /* use a quarter of the TLBCAM for bolted linear map */
diff --git a/arch/riscv/include/asm/fixmap.h b/arch/riscv/include/asm/fixmap.h
index 9c66033c3a54..161f28d04a07 100644
--- a/arch/riscv/include/asm/fixmap.h
+++ b/arch/riscv/include/asm/fixmap.h
@@ -30,10 +30,6 @@ enum fixed_addresses {
         __end_of_fixed_addresses
 };
 
-#define FIXADDR_SIZE            (__end_of_fixed_addresses * PAGE_SIZE)
-#define FIXADDR_TOP             (VMALLOC_START)
-#define FIXADDR_START           (FIXADDR_TOP - FIXADDR_SIZE)
-
 #define FIXMAP_PAGE_IO          PAGE_KERNEL
 
 #define __early_set_fixmap      __set_fixmap
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index a364aba23d55..c24a083b3e12 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -420,14 +420,22 @@ static inline void pgtable_cache_init(void)
 #define VMALLOC_END      (PAGE_OFFSET - 1)
 #define VMALLOC_START    (PAGE_OFFSET - VMALLOC_SIZE)
 
+#define FIXADDR_TOP      VMALLOC_START
+#ifdef CONFIG_64BIT
+#define FIXADDR_SIZE     PMD_SIZE
+#else
+#define FIXADDR_SIZE     PGDIR_SIZE
+#endif
+#define FIXADDR_START    (FIXADDR_TOP - FIXADDR_SIZE)
+
 /*
- * Task size is 0x4000000000 for RV64 or 0xb800000 for RV32.
+ * Task size is 0x4000000000 for RV64 or 0x9fc00000 for RV32.
  * Note that PGDIR_SIZE must evenly divide TASK_SIZE.
  */
 #ifdef CONFIG_64BIT
 #define TASK_SIZE (PGDIR_SIZE * PTRS_PER_PGD / 2)
 #else
-#define TASK_SIZE VMALLOC_START
+#define TASK_SIZE FIXADDR_START
 #endif
 
 #include <asm-generic/pgtable.h>
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index e636728ab452..955eb355c2fd 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -863,7 +863,7 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i
                 break;
         case BPF_ALU64 | BPF_NEG: /* dst = -dst */
                 /* lcgr %dst,%dst */
-                EMIT4(0xb9130000, dst_reg, dst_reg);
+                EMIT4(0xb9030000, dst_reg, dst_reg);
                 break;
         /*
          * BPF_FROM_BE/LE
@@ -1049,8 +1049,8 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i
                 /* llgf %w1,map.max_entries(%b2) */
                 EMIT6_DISP_LH(0xe3000000, 0x0016, REG_W1, REG_0, BPF_REG_2,
                               offsetof(struct bpf_array, map.max_entries));
-                /* clgrj %b3,%w1,0xa,label0: if %b3 >= %w1 goto out */
-                EMIT6_PCREL_LABEL(0xec000000, 0x0065, BPF_REG_3,
+                /* clrj %b3,%w1,0xa,label0: if (u32)%b3 >= (u32)%w1 goto out */
+                EMIT6_PCREL_LABEL(0xec000000, 0x0077, BPF_REG_3,
                                   REG_W1, 0, 0xa);
 
                 /*
@@ -1076,8 +1076,10 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i
                  *         goto out;
                  */
 
-                /* sllg %r1,%b3,3: %r1 = index * 8 */
-                EMIT6_DISP_LH(0xeb000000, 0x000d, REG_1, BPF_REG_3, REG_0, 3);
+                /* llgfr %r1,%b3: %r1 = (u32) index */
+                EMIT4(0xb9160000, REG_1, BPF_REG_3);
+                /* sllg %r1,%r1,3: %r1 *= 8 */
+                EMIT6_DISP_LH(0xeb000000, 0x000d, REG_1, REG_1, REG_0, 3);
                 /* lg %r1,prog(%b2,%r1) */
                 EMIT6_DISP_LH(0xe3000000, 0x0004, REG_1, BPF_REG_2,
                               REG_1, offsetof(struct bpf_array, ptrs));
diff --git a/arch/um/include/shared/timer-internal.h b/arch/um/include/shared/timer-internal.h
index 8574338bf23b..9991ec2371e4 100644
--- a/arch/um/include/shared/timer-internal.h
+++ b/arch/um/include/shared/timer-internal.h
@@ -34,10 +34,13 @@ static inline void time_travel_set_time(unsigned long long ns)
         time_travel_time = ns;
 }
 
-static inline void time_travel_set_timer(enum time_travel_timer_mode mode,
-                                         unsigned long long expiry)
+static inline void time_travel_set_timer_mode(enum time_travel_timer_mode mode)
 {
         time_travel_timer_mode = mode;
+}
+
+static inline void time_travel_set_timer_expiry(unsigned long long expiry)
+{
         time_travel_timer_expiry = expiry;
 }
 #else
@@ -50,8 +53,11 @@ static inline void time_travel_set_time(unsigned long long ns)
 {
 }
 
-static inline void time_travel_set_timer(enum time_travel_timer_mode mode,
-                                         unsigned long long expiry)
+static inline void time_travel_set_timer_mode(enum time_travel_timer_mode mode)
+{
+}
+
+static inline void time_travel_set_timer_expiry(unsigned long long expiry)
 {
 }
 
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 67c0d1a860e9..6bede7888fc2 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -213,7 +213,7 @@ static void time_travel_sleep(unsigned long long duration)
         if (time_travel_timer_mode != TT_TMR_DISABLED ||
             time_travel_timer_expiry < next) {
                 if (time_travel_timer_mode == TT_TMR_ONESHOT)
-                        time_travel_set_timer(TT_TMR_DISABLED, 0);
+                        time_travel_set_timer_mode(TT_TMR_DISABLED);
                 /*
                  * time_travel_time will be adjusted in the timer
                  * IRQ handler so it works even when the signal
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 6a051b078359..234757233355 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -50,7 +50,7 @@ void timer_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
 static int itimer_shutdown(struct clock_event_device *evt)
 {
         if (time_travel_mode != TT_MODE_OFF)
-                time_travel_set_timer(TT_TMR_DISABLED, 0);
+                time_travel_set_timer_mode(TT_TMR_DISABLED);
 
         if (time_travel_mode != TT_MODE_INFCPU)
                 os_timer_disable();
@@ -62,9 +62,10 @@ static int itimer_set_periodic(struct clock_event_device *evt)
 {
         unsigned long long interval = NSEC_PER_SEC / HZ;
 
-        if (time_travel_mode != TT_MODE_OFF)
-                time_travel_set_timer(TT_TMR_PERIODIC,
-                                      time_travel_time + interval);
+        if (time_travel_mode != TT_MODE_OFF) {
+                time_travel_set_timer_mode(TT_TMR_PERIODIC);
+                time_travel_set_timer_expiry(time_travel_time + interval);
+        }
 
         if (time_travel_mode != TT_MODE_INFCPU)
                 os_timer_set_interval(interval);
@@ -77,9 +78,10 @@ static int itimer_next_event(unsigned long delta,
 {
         delta += 1;
 
-        if (time_travel_mode != TT_MODE_OFF)
-                time_travel_set_timer(TT_TMR_ONESHOT,
-                                      time_travel_time + delta);
+        if (time_travel_mode != TT_MODE_OFF) {
+                time_travel_set_timer_mode(TT_TMR_ONESHOT);
+                time_travel_set_timer_expiry(time_travel_time + delta);
+        }
 
         if (time_travel_mode != TT_MODE_INFCPU)
                 return os_timer_one_shot(delta);
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 56e748a7679f..94df0868804b 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -38,6 +38,7 @@ REALMODE_CFLAGS	:= $(M16_CFLAGS) -g -Os -DDISABLE_BRANCH_PROFILING \
 
 REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -ffreestanding)
 REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -fno-stack-protector)
+REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -Wno-address-of-packed-member)
 REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), $(cc_stack_align4))
 export REALMODE_CFLAGS
 
diff --git a/arch/x86/boot/compressed/pgtable_64.c b/arch/x86/boot/compressed/pgtable_64.c
index 5f2d03067ae5..c8862696a47b 100644
--- a/arch/x86/boot/compressed/pgtable_64.c
+++ b/arch/x86/boot/compressed/pgtable_64.c
@@ -72,6 +72,8 @@ static unsigned long find_trampoline_placement(void)
 
         /* Find the first usable memory region under bios_start. */
         for (i = boot_params->e820_entries - 1; i >= 0; i--) {
+                unsigned long new = bios_start;
+
                 entry = &boot_params->e820_table[i];
 
                 /* Skip all entries above bios_start. */
@@ -84,15 +86,20 @@ static unsigned long find_trampoline_placement(void)
 
                 /* Adjust bios_start to the end of the entry if needed. */
                 if (bios_start > entry->addr + entry->size)
-                        bios_start = entry->addr + entry->size;
+                        new = entry->addr + entry->size;
 
                 /* Keep bios_start page-aligned. */
-                bios_start = round_down(bios_start, PAGE_SIZE);
+                new = round_down(new, PAGE_SIZE);
 
                 /* Skip the entry if it's too small. */
-                if (bios_start - TRAMPOLINE_32BIT_SIZE < entry->addr)
+                if (new - TRAMPOLINE_32BIT_SIZE < entry->addr)
                         continue;
 
+                /* Protect against underflow. */
+                if (new - TRAMPOLINE_32BIT_SIZE > bios_start)
+                        break;
+
+                bios_start = new;
                 break;
         }
 
diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c
index 62f317c9113a..5b35b7ea5d72 100644
--- a/arch/x86/events/amd/ibs.c
+++ b/arch/x86/events/amd/ibs.c
@@ -661,10 +661,17 @@ fail:
 
         throttle = perf_event_overflow(event, &data, &regs);
 out:
-        if (throttle)
+        if (throttle) {
                 perf_ibs_stop(event, 0);
-        else
-                perf_ibs_enable_event(perf_ibs, hwc, period >> 4);
+        } else {
+                period >>= 4;
+
+                if ((ibs_caps & IBS_CAPS_RDWROPCNT) &&
+                    (*config & IBS_OP_CNT_CTL))
+                        period |= *config & IBS_OP_CUR_CNT_RAND;
+
+                perf_ibs_enable_event(perf_ibs, hwc, period);
+        }
 
         perf_event_update_userpage(event);
 
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 81b005e4c7d9..325959d19d9a 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -1236,7 +1236,7 @@ void x86_pmu_enable_event(struct perf_event *event)
  * Add a single event to the PMU.
  *
  * The event is added to the group of enabled events
- * but only if it can be scehduled with existing events.
+ * but only if it can be scheduled with existing events.
  */
 static int x86_pmu_add(struct perf_event *event, int flags)
 {
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 648260b5f367..e4c2cb65ea50 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -3572,6 +3572,11 @@ static u64 bdw_limit_period(struct perf_event *event, u64 left)
         return left;
 }
 
+static u64 nhm_limit_period(struct perf_event *event, u64 left)
+{
+        return max(left, 32ULL);
+}
+
 PMU_FORMAT_ATTR(event,  "config:0-7"    );
 PMU_FORMAT_ATTR(umask,  "config:8-15"   );
 PMU_FORMAT_ATTR(edge,   "config:18"     );
@@ -4606,6 +4611,7 @@ __init int intel_pmu_init(void)
                 x86_pmu.pebs_constraints = intel_nehalem_pebs_event_constraints;
                 x86_pmu.enable_all = intel_pmu_nhm_enable_all;
                 x86_pmu.extra_regs = intel_nehalem_extra_regs;
+                x86_pmu.limit_period = nhm_limit_period;
 
                 mem_attr = nhm_mem_events_attrs;
 
diff --git a/arch/x86/hyperv/mmu.c b/arch/x86/hyperv/mmu.c
index e65d7fe6489f..5208ba49c89a 100644
--- a/arch/x86/hyperv/mmu.c
+++ b/arch/x86/hyperv/mmu.c
@@ -37,12 +37,14 @@ static inline int fill_gva_list(u64 gva_list[], int offset,
                  * Lower 12 bits encode the number of additional
                  * pages to flush (in addition to the 'cur' page).
                  */
-                if (diff >= HV_TLB_FLUSH_UNIT)
+                if (diff >= HV_TLB_FLUSH_UNIT) {
                         gva_list[gva_n] |= ~PAGE_MASK;
-                else if (diff)
+                        cur += HV_TLB_FLUSH_UNIT;
+                }  else if (diff) {
                         gva_list[gva_n] |= (diff - 1) >> PAGE_SHIFT;
+                        cur = end;
+                }
 
-                cur += HV_TLB_FLUSH_UNIT;
                 gva_n++;
 
         } while (cur < end);
diff --git a/arch/x86/include/asm/bootparam_utils.h b/arch/x86/include/asm/bootparam_utils.h
index f5e90a849bca..981fe923a59f 100644
--- a/arch/x86/include/asm/bootparam_utils.h
+++ b/arch/x86/include/asm/bootparam_utils.h
@@ -59,7 +59,6 @@ static void sanitize_boot_params(struct boot_params *boot_params)
                         BOOT_PARAM_PRESERVE(apm_bios_info),
                         BOOT_PARAM_PRESERVE(tboot_addr),
                         BOOT_PARAM_PRESERVE(ist_info),
-                        BOOT_PARAM_PRESERVE(acpi_rsdp_addr),
                         BOOT_PARAM_PRESERVE(hd0_info),
                         BOOT_PARAM_PRESERVE(hd1_info),
                         BOOT_PARAM_PRESERVE(sys_desc_table),
@@ -71,6 +70,8 @@ static void sanitize_boot_params(struct boot_params *boot_params)
                         BOOT_PARAM_PRESERVE(eddbuf_entries),
                         BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries),
                         BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer),
+                        BOOT_PARAM_PRESERVE(secure_boot),
+                        BOOT_PARAM_PRESERVE(hdr),
                         BOOT_PARAM_PRESERVE(e820_table),
                         BOOT_PARAM_PRESERVE(eddbuf),
                 };
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
index 287f1f7b2e52..c38a66661576 100644
--- a/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@ -16,7 +16,6 @@
 #define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR
 
 #ifndef __ASSEMBLY__
-extern void mcount(void);
 extern atomic_t modifying_ftrace_code;
 extern void __fentry__(void);
 
diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index 0278aa66ef62..fe7c205233f1 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -11,6 +11,21 @@
  * While adding a new CPUID for a new microarchitecture, add a new
  * group to keep logically sorted out in chronological order. Within
  * that group keep the CPUID for the variants sorted by model number.
+ *
+ * The defined symbol names have the following form:
+ *      INTEL_FAM6{OPTFAMILY}_{MICROARCH}{OPTDIFF}
+ * where:
+ * OPTFAMILY    Describes the family of CPUs that this belongs to. Default
+ *              is assumed to be "_CORE" (and should be omitted). Other values
+ *              currently in use are _ATOM and _XEON_PHI
+ * MICROARCH    Is the code name for the micro-architecture for this core.
+ *              N.B. Not the platform name.
+ * OPTDIFF      If needed, a short string to differentiate by market segment.
+ *              Exact strings here will vary over time. _DESKTOP, _MOBILE, and
+ *              _X (short for Xeon server) should be used when they are
+ *              appropriate.
+ *
+ * The #define line may optionally include a comment including platform names.
  */
 
 #define INTEL_FAM6_CORE_YONAH           0x0E
diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h
index baedab8ac538..b91623d521d9 100644
--- a/arch/x86/include/asm/iommu.h
+++ b/arch/x86/include/asm/iommu.h
@@ -4,7 +4,6 @@
 
 extern int force_iommu, no_iommu;
 extern int iommu_detected;
-extern int iommu_pass_through;
 
 /* 10 seconds */
 #define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000)
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 6b4fc2788078..271d837d69a8 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -381,6 +381,7 @@
 #define MSR_AMD64_PATCH_LEVEL           0x0000008b
 #define MSR_AMD64_TSC_RATIO             0xc0000104
 #define MSR_AMD64_NB_CFG                0xc001001f
+#define MSR_AMD64_CPUID_FN_1            0xc0011004
 #define MSR_AMD64_PATCH_LOADER          0xc0010020
 #define MSR_AMD64_OSVW_ID_LENGTH        0xc0010140
 #define MSR_AMD64_OSVW_STATUS           0xc0010141
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
index 109f974f9835..80bc209c0708 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -192,7 +192,7 @@
         "       lfence;\n"                                      \
         "       jmp    902b;\n"                                 \
         "       .align 16\n"                                    \
-        "903:   addl   $4, %%esp;\n"                            \
+        "903:   lea    4(%%esp), %%esp;\n"                      \
         "       pushl  %[thunk_target];\n"                      \
         "       ret;\n"                                         \
         "       .align 16\n"                                    \
diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h
index 1392d5e6e8d6..ee26e9215f18 100644
--- a/arch/x86/include/asm/perf_event.h
+++ b/arch/x86/include/asm/perf_event.h
@@ -252,16 +252,20 @@ struct pebs_lbr {
 #define IBSCTL_LVT_OFFSET_VALID         (1ULL<<8)
 #define IBSCTL_LVT_OFFSET_MASK          0x0F
 
-/* ibs fetch bits/masks */
+/* IBS fetch bits/masks */
 #define IBS_FETCH_RAND_EN       (1ULL<<57)
 #define IBS_FETCH_VAL           (1ULL<<49)
 #define IBS_FETCH_ENABLE        (1ULL<<48)
 #define IBS_FETCH_CNT           0xFFFF0000ULL
 #define IBS_FETCH_MAX_CNT       0x0000FFFFULL
 
-/* ibs op bits/masks */
-/* lower 4 bits of the current count are ignored: */
-#define IBS_OP_CUR_CNT          (0xFFFF0ULL<<32)
+/*
+ * IBS op bits/masks
+ * The lower 7 bits of the current count are random bits
+ * preloaded by hardware and ignored in software
+ */
+#define IBS_OP_CUR_CNT          (0xFFF80ULL<<32)
+#define IBS_OP_CUR_CNT_RAND     (0x0007FULL<<32)
 #define IBS_OP_CNT_CTL          (1ULL<<19)
 #define IBS_OP_VAL              (1ULL<<18)
 #define IBS_OP_ENABLE           (1ULL<<17)
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
index 9c4435307ff8..35c225ede0e4 100644
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -444,8 +444,10 @@ __pu_label:							\
 ({                                                                      \
         int __gu_err;                                                   \
         __inttype(*(ptr)) __gu_val;                                     \
+        __typeof__(ptr) __gu_ptr = (ptr);                               \
+        __typeof__(size) __gu_size = (size);                            \
         __uaccess_begin_nospec();                                       \
-        __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT);    \
+        __get_user_size(__gu_val, __gu_ptr, __gu_size, __gu_err, -EFAULT);      \
         __uaccess_end();                                                \
         (x) = (__force __typeof__(*(ptr)))__gu_val;                     \
         __builtin_expect(__gu_err, 0);                                  \
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index f5291362da1a..aa5495d0f478 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -722,7 +722,7 @@ static __initdata unsigned long lapic_cal_pm1, lapic_cal_pm2;
 static __initdata unsigned long lapic_cal_j1, lapic_cal_j2;
 
 /*
- * Temporary interrupt handler.
+ * Temporary interrupt handler and polled calibration function.
  */
 static void __init lapic_cal_handler(struct clock_event_device *dev)
 {
@@ -851,7 +851,8 @@ bool __init apic_needs_pit(void)
 static int __init calibrate_APIC_clock(void)
 {
         struct clock_event_device *levt = this_cpu_ptr(&lapic_events);
-        void (*real_handler)(struct clock_event_device *dev);
+        u64 tsc_perj = 0, tsc_start = 0;
+        unsigned long jif_start;
         unsigned long deltaj;
         long delta, deltatsc;
         int pm_referenced = 0;
@@ -878,28 +879,64 @@ static int __init calibrate_APIC_clock(void)
         apic_printk(APIC_VERBOSE, "Using local APIC timer interrupts.\n"
                     "calibrating APIC timer ...\n");
 
+        /*
+         * There are platforms w/o global clockevent devices. Instead of
+         * making the calibration conditional on that, use a polling based
+         * approach everywhere.
+         */
         local_irq_disable();
 
-        /* Replace the global interrupt handler */
-        real_handler = global_clock_event->event_handler;
-        global_clock_event->event_handler = lapic_cal_handler;
-
         /*
          * Setup the APIC counter to maximum. There is no way the lapic
          * can underflow in the 100ms detection time frame
          */
         __setup_APIC_LVTT(0xffffffff, 0, 0);
 
-        /* Let the interrupts run */
+        /*
+         * Methods to terminate the calibration loop:
+         *  1) Global clockevent if available (jiffies)
+         *  2) TSC if available and frequency is known
+         */
+        jif_start = READ_ONCE(jiffies);
+
+        if (tsc_khz) {
+                tsc_start = rdtsc();
+                tsc_perj = div_u64((u64)tsc_khz * 1000, HZ);
+        }
+
+        /*
+         * Enable interrupts so the tick can fire, if a global
+         * clockevent device is available
+         */
         local_irq_enable();
 
-        while (lapic_cal_loops <= LAPIC_CAL_LOOPS)
-                cpu_relax();
+        while (lapic_cal_loops <= LAPIC_CAL_LOOPS) {
+                /* Wait for a tick to elapse */
+                while (1) {
+                        if (tsc_khz) {
+                                u64 tsc_now = rdtsc();
+                                if ((tsc_now - tsc_start) >= tsc_perj) {
+                                        tsc_start += tsc_perj;
+                                        break;
+                                }
+                        } else {
+                                unsigned long jif_now = READ_ONCE(jiffies);
 
-        local_irq_disable();
+                                if (time_after(jif_now, jif_start)) {
+                                        jif_start = jif_now;
+                                        break;
+                                }
+                        }
+                        cpu_relax();
+                }
 
-        /* Restore the real event handler */
-        global_clock_event->event_handler = real_handler;
+                /* Invoke the calibration routine */
+                local_irq_disable();
+                lapic_cal_handler(NULL);
+                local_irq_enable();
+        }
+
+        local_irq_disable();
 
         /* Build delta t1-t2 as apic timer counts down */
         delta = lapic_cal_t1 - lapic_cal_t2;
@@ -943,10 +980,11 @@ static int __init calibrate_APIC_clock(void)
         levt->features &= ~CLOCK_EVT_FEAT_DUMMY;
 
         /*
-         * PM timer calibration failed or not turned on
-         * so lets try APIC timer based calibration
+         * PM timer calibration failed or not turned on so lets try APIC
+         * timer based calibration, if a global clockevent device is
+         * available.
          */
-        if (!pm_referenced) {
+        if (!pm_referenced && global_clock_event) {
                 apic_printk(APIC_VERBOSE, "... verify APIC timer\n");
 
                 /*
diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index afee386ff711..caedd8d60d36 100644
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -38,32 +38,12 @@ static int bigsmp_early_logical_apicid(int cpu)
         return early_per_cpu(x86_cpu_to_apicid, cpu);
 }
 
-static inline unsigned long calculate_ldr(int cpu)
-{
-        unsigned long val, id;
-
-        val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
-        id = per_cpu(x86_bios_cpu_apicid, cpu);
-        val |= SET_APIC_LOGICAL_ID(id);
-
-        return val;
-}
-
 /*
- * Set up the logical destination ID.
- *
- * Intel recommends to set DFR, LDR and TPR before enabling
- * an APIC.  See e.g. "AP-388 82489DX User's Manual" (Intel
- * document number 292116).  So here it goes...
+ * bigsmp enables physical destination mode
+ * and doesn't use LDR and DFR
  */
 static void bigsmp_init_apic_ldr(void)
 {
-        unsigned long val;
-        int cpu = smp_processor_id();
-
-        apic_write(APIC_DFR, APIC_DFR_FLAT);
-        val = calculate_ldr(cpu);
-        apic_write(APIC_LDR, val);
 }
 
 static void bigsmp_setup_apic_routing(void)
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index c7bb6c69f21c..d6af97fd170a 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2438,7 +2438,13 @@ unsigned int arch_dynirq_lower_bound(unsigned int from)
          * dmar_alloc_hwirq() may be called before setup_IO_APIC(), so use
          * gsi_top if ioapic_dynirq_base hasn't been initialized yet.
          */
-        return ioapic_initialized ? ioapic_dynirq_base : gsi_top;
+        if (!ioapic_initialized)
+                return gsi_top;
+        /*
+         * For DT enabled machines ioapic_dynirq_base is irrelevant and not
+         * updated. So simply return @from if ioapic_dynirq_base == 0.
+         */
+        return ioapic_dynirq_base ? : from;
 }
 
 #ifdef CONFIG_X86_32
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 8d4e50428b68..68c363c341bf 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -804,6 +804,64 @@ static void init_amd_ln(struct cpuinfo_x86 *c)
         msr_set_bit(MSR_AMD64_DE_CFG, 31);
 }
 
+static bool rdrand_force;
+
+static int __init rdrand_cmdline(char *str)
+{
+        if (!str)
+                return -EINVAL;
+
+        if (!strcmp(str, "force"))
+                rdrand_force = true;
+        else
+                return -EINVAL;
+
+        return 0;
+}
+early_param("rdrand", rdrand_cmdline);
+
+static void clear_rdrand_cpuid_bit(struct cpuinfo_x86 *c)
+{
+        /*
+         * Saving of the MSR used to hide the RDRAND support during
+         * suspend/resume is done by arch/x86/power/cpu.c, which is
+         * dependent on CONFIG_PM_SLEEP.
+         */
+        if (!IS_ENABLED(CONFIG_PM_SLEEP))
+                return;
+
+        /*
+         * The nordrand option can clear X86_FEATURE_RDRAND, so check for
+         * RDRAND support using the CPUID function directly.
+         */
+        if (!(cpuid_ecx(1) & BIT(30)) || rdrand_force)
+                return;
+
+        msr_clear_bit(MSR_AMD64_CPUID_FN_1, 62);
+
+        /*
+         * Verify that the CPUID change has occurred in case the kernel is
+         * running virtualized and the hypervisor doesn't support the MSR.
+         */
+        if (cpuid_ecx(1) & BIT(30)) {
+                pr_info_once("BIOS may not properly restore RDRAND after suspend, but hypervisor does not support hiding RDRAND via CPUID.\n");
+                return;
+        }
+
+        clear_cpu_cap(c, X86_FEATURE_RDRAND);
+        pr_info_once("BIOS may not properly restore RDRAND after suspend, hiding RDRAND via CPUID. Use rdrand=force to reenable.\n");
+}
+
+static void init_amd_jg(struct cpuinfo_x86 *c)
+{
+        /*
+         * Some BIOS implementations do not restore proper RDRAND support
+         * across suspend and resume. Check on whether to hide the RDRAND
+         * instruction support via CPUID.
+         */
+        clear_rdrand_cpuid_bit(c);
+}
+
 static void init_amd_bd(struct cpuinfo_x86 *c)
 {
         u64 value;
@@ -818,6 +876,13 @@ static void init_amd_bd(struct cpuinfo_x86 *c)
                         wrmsrl_safe(MSR_F15H_IC_CFG, value);
                 }
         }
+
+        /*
+         * Some BIOS implementations do not restore proper RDRAND support
+         * across suspend and resume. Check on whether to hide the RDRAND
+         * instruction support via CPUID.
+         */
+        clear_rdrand_cpuid_bit(c);
 }
 
 static void init_amd_zn(struct cpuinfo_x86 *c)
@@ -860,6 +925,7 @@ static void init_amd(struct cpuinfo_x86 *c)
         case 0x10: init_amd_gh(c); break;
         case 0x12: init_amd_ln(c); break;
         case 0x15: init_amd_bd(c); break;
+        case 0x16: init_amd_jg(c); break;
         case 0x17: init_amd_zn(c); break;
         }
 
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index f62b498b18fb..fa4352dce491 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/dma-direct.h>
 #include <linux/dma-debug.h>
+#include <linux/iommu.h>
 #include <linux/dmar.h>
 #include <linux/export.h>
 #include <linux/memblock.h>
@@ -34,21 +35,6 @@ int no_iommu __read_mostly;
 /* Set this to 1 if there is a HW IOMMU in the system */
 int iommu_detected __read_mostly = 0;
 
-/*
- * This variable becomes 1 if iommu=pt is passed on the kernel command line.
- * If this variable is 1, IOMMU implementations do no DMA translation for
- * devices and allow every device to access to whole physical memory. This is
- * useful if a user wants to use an IOMMU only for KVM device assignment to
- * guests and not for driver dma translation.
- * It is also possible to disable by default in kernel config, and enable with
- * iommu=nopt at boot time.
- */
-#ifdef CONFIG_IOMMU_DEFAULT_PASSTHROUGH
-int iommu_pass_through __read_mostly = 1;
-#else
-int iommu_pass_through __read_mostly;
-#endif
-
 extern struct iommu_table_entry __iommu_table[], __iommu_table_end[];
 
 void __init pci_iommu_alloc(void)
@@ -120,9 +106,9 @@ static __init int iommu_setup(char *p)
                         swiotlb = 1;
 #endif
                 if (!strncmp(p, "pt", 2))
-                        iommu_pass_through = 1;
+                        iommu_set_default_passthrough(true);
                 if (!strncmp(p, "nopt", 4))
-                        iommu_pass_through = 0;
+                        iommu_set_default_translated(true);
 
                 gart_parse_options(p);
 
diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
index d8359ebeea70..8cd745ef8c7b 100644
--- a/arch/x86/kernel/uprobes.c
+++ b/arch/x86/kernel/uprobes.c
@@ -508,9 +508,12 @@ struct uprobe_xol_ops {
         void    (*abort)(struct arch_uprobe *, struct pt_regs *);
 };
 
-static inline int sizeof_long(void)
+static inline int sizeof_long(struct pt_regs *regs)
 {
-        return in_ia32_syscall() ? 4 : 8;
+        /*
+         * Check registers for mode as in_xxx_syscall() does not apply here.
+         */
+        return user_64bit_mode(regs) ? 8 : 4;
 }
 
 static int default_pre_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regs)
@@ -521,9 +524,9 @@ static int default_pre_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regs)
 
 static int emulate_push_stack(struct pt_regs *regs, unsigned long val)
 {
-        unsigned long new_sp = regs->sp - sizeof_long();
+        unsigned long new_sp = regs->sp - sizeof_long(regs);
 
-        if (copy_to_user((void __user *)new_sp, &val, sizeof_long()))
+        if (copy_to_user((void __user *)new_sp, &val, sizeof_long(regs)))
                 return -EFAULT;
 
         regs->sp = new_sp;
@@ -556,7 +559,7 @@ static int default_post_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regs
                 long correction = utask->vaddr - utask->xol_vaddr;
                 regs->ip += correction;
         } else if (auprobe->defparam.fixups & UPROBE_FIX_CALL) {
-                regs->sp += sizeof_long(); /* Pop incorrect return address */
+                regs->sp += sizeof_long(regs); /* Pop incorrect return address */
                 if (emulate_push_stack(regs, utask->vaddr + auprobe->defparam.ilen))
                         return -ERESTART;
         }
@@ -675,7 +678,7 @@ static int branch_post_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regs)
          * "call" insn was executed out-of-line. Just restore ->sp and restart.
          * We could also restore ->ip and try to call branch_emulate_op() again.
          */
-        regs->sp += sizeof_long();
+        regs->sp += sizeof_long(regs);
         return -ERESTART;
 }
 
@@ -1056,7 +1059,7 @@ bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)
 unsigned long
 arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs *regs)
 {
-        int rasize = sizeof_long(), nleft;
+        int rasize = sizeof_long(regs), nleft;
         unsigned long orig_ret_vaddr = 0; /* clear high bits for 32-bit apps */
 
         if (copy_from_user(&orig_ret_vaddr, (void __user *)regs->sp, rasize))
diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index c10a8b10b203..fff790a3f4ee 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -1781,7 +1781,7 @@ int kvm_vm_ioctl_hv_eventfd(struct kvm *kvm, struct kvm_hyperv_eventfd *args)
 int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid,
                                 struct kvm_cpuid_entry2 __user *entries)
 {
-        uint16_t evmcs_ver = kvm_x86_ops->nested_get_evmcs_version(vcpu);
+        uint16_t evmcs_ver = 0;
         struct kvm_cpuid_entry2 cpuid_entries[] = {
                 { .function = HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS },
                 { .function = HYPERV_CPUID_INTERFACE },
@@ -1793,6 +1793,9 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid,
         };
         int i, nent = ARRAY_SIZE(cpuid_entries);
 
+        if (kvm_x86_ops->nested_get_evmcs_version)
+                evmcs_ver = kvm_x86_ops->nested_get_evmcs_version(vcpu);
+
         /* Skip NESTED_FEATURES if eVMCS is not supported */
         if (!evmcs_ver)
                 --nent;
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 685d17c11461..e904ff06a83d 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -216,6 +216,9 @@ static void recalculate_apic_map(struct kvm *kvm)
                 if (!apic_x2apic_mode(apic) && !new->phys_map[xapic_id])
                         new->phys_map[xapic_id] = apic;
 
+                if (!kvm_apic_sw_enabled(apic))
+                        continue;
+
                 ldr = kvm_lapic_get_reg(apic, APIC_LDR);
 
                 if (apic_x2apic_mode(apic)) {
@@ -258,6 +261,8 @@ static inline void apic_set_spiv(struct kvm_lapic *apic, u32 val)
                         static_key_slow_dec_deferred(&apic_sw_disabled);
                 else
                         static_key_slow_inc(&apic_sw_disabled.key);
+
+                recalculate_apic_map(apic->vcpu->kvm);
         }
 }
 
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 24843cf49579..218b277bfda3 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -5653,38 +5653,7 @@ static void kvm_mmu_invalidate_zap_pages_in_memslot(struct kvm *kvm,
                         struct kvm_memory_slot *slot,
                         struct kvm_page_track_notifier_node *node)
 {
-        struct kvm_mmu_page *sp;
-        LIST_HEAD(invalid_list);
-        unsigned long i;
-        bool flush;
-        gfn_t gfn;
-
-        spin_lock(&kvm->mmu_lock);
-
-        if (list_empty(&kvm->arch.active_mmu_pages))
-                goto out_unlock;
-
-        flush = slot_handle_all_level(kvm, slot, kvm_zap_rmapp, false);
-
-        for (i = 0; i < slot->npages; i++) {
-                gfn = slot->base_gfn + i;
-
-                for_each_valid_sp(kvm, sp, gfn) {
-                        if (sp->gfn != gfn)
-                                continue;
-
-                        kvm_mmu_prepare_zap_page(kvm, sp, &invalid_list);
-                }
-                if (need_resched() || spin_needbreak(&kvm->mmu_lock)) {
-                        kvm_mmu_remote_flush_or_zap(kvm, &invalid_list, flush);
-                        flush = false;
-                        cond_resched_lock(&kvm->mmu_lock);
-                }
-        }
-        kvm_mmu_remote_flush_or_zap(kvm, &invalid_list, flush);
-
-out_unlock:
-        spin_unlock(&kvm->mmu_lock);
+        kvm_mmu_zap_all(kvm);
 }
 
 void kvm_mmu_init_vm(struct kvm *kvm)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index d685491fce4d..e0368076a1ef 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1714,7 +1714,6 @@ static int avic_init_backing_page(struct kvm_vcpu *vcpu)
         if (!entry)
                 return -EINVAL;
 
-        new_entry = READ_ONCE(*entry);
         new_entry = __sme_set((page_to_phys(svm->avic_backing_page) &
                               AVIC_PHYSICAL_ID_ENTRY_BACKING_PAGE_MASK) |
                               AVIC_PHYSICAL_ID_ENTRY_VALID_MASK);
@@ -7129,12 +7128,6 @@ failed:
         return ret;
 }
 
-static uint16_t nested_get_evmcs_version(struct kvm_vcpu *vcpu)
-{
-        /* Not supported */
-        return 0;
-}
-
 static int nested_enable_evmcs(struct kvm_vcpu *vcpu,
                                    uint16_t *vmcs_version)
 {
@@ -7333,7 +7326,7 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = {
         .mem_enc_unreg_region = svm_unregister_enc_region,
 
         .nested_enable_evmcs = nested_enable_evmcs,
-        .nested_get_evmcs_version = nested_get_evmcs_version,
+        .nested_get_evmcs_version = NULL,
 
         .need_emulation_on_page_fault = svm_need_emulation_on_page_fault,
 };
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 42ed3faa6af8..c030c96fc81a 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -7797,6 +7797,7 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = {
         .set_nested_state = NULL,
         .get_vmcs12_pages = NULL,
         .nested_enable_evmcs = NULL,
+        .nested_get_evmcs_version = NULL,
         .need_emulation_on_page_fault = vmx_need_emulation_on_page_fault,
 };
 
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 93b0bd45ac73..290c3c3efb87 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6594,12 +6594,13 @@ restart:
                 unsigned long rflags = kvm_x86_ops->get_rflags(vcpu);
                 toggle_interruptibility(vcpu, ctxt->interruptibility);
                 vcpu->arch.emulate_regs_need_sync_to_vcpu = false;
-                kvm_rip_write(vcpu, ctxt->eip);
-                if (r == EMULATE_DONE && ctxt->tf)
-                        kvm_vcpu_do_singlestep(vcpu, &r);
                 if (!ctxt->have_exception ||
-                    exception_type(ctxt->exception.vector) == EXCPT_TRAP)
+                    exception_type(ctxt->exception.vector) == EXCPT_TRAP) {
+                        kvm_rip_write(vcpu, ctxt->eip);
+                        if (r == EMULATE_DONE && ctxt->tf)
+                                kvm_vcpu_do_singlestep(vcpu, &r);
                         __kvm_set_rflags(vcpu, ctxt->eflags);
+                }
 
                 /*
                  * For STI, interrupts are shadowed; so KVM_REQ_EVENT will
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 6a9a77a403c9..e14e95ea7338 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -516,7 +516,7 @@ static inline void check_conflict(int warnlvl, pgprot_t prot, pgprotval_t val,
  */
 static inline pgprot_t static_protections(pgprot_t prot, unsigned long start,
                                           unsigned long pfn, unsigned long npg,
-                                          int warnlvl)
+                                          unsigned long lpsize, int warnlvl)
 {
         pgprotval_t forbidden, res;
         unsigned long end;
@@ -535,9 +535,17 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long start,
         check_conflict(warnlvl, prot, res, start, end, pfn, "Text NX");
         forbidden = res;
 
-        res = protect_kernel_text_ro(start, end);
-        check_conflict(warnlvl, prot, res, start, end, pfn, "Text RO");
-        forbidden |= res;
+        /*
+         * Special case to preserve a large page. If the change spawns the
+         * full large page mapping then there is no point to split it
+         * up. Happens with ftrace and is going to be removed once ftrace
+         * switched to text_poke().
+         */
+        if (lpsize != (npg * PAGE_SIZE) || (start & (lpsize - 1))) {
+                res = protect_kernel_text_ro(start, end);
+                check_conflict(warnlvl, prot, res, start, end, pfn, "Text RO");
+                forbidden |= res;
+        }
 
         /* Check the PFN directly */
         res = protect_pci_bios(pfn, pfn + npg - 1);
@@ -819,7 +827,7 @@ static int __should_split_large_page(pte_t *kpte, unsigned long address,
          * extra conditional required here.
          */
         chk_prot = static_protections(old_prot, lpaddr, old_pfn, numpages,
-                                      CPA_CONFLICT);
+                                      psize, CPA_CONFLICT);
 
         if (WARN_ON_ONCE(pgprot_val(chk_prot) != pgprot_val(old_prot))) {
                 /*
@@ -855,7 +863,7 @@ static int __should_split_large_page(pte_t *kpte, unsigned long address,
          * protection requirement in the large page.
          */
         new_prot = static_protections(req_prot, lpaddr, old_pfn, numpages,
-                                      CPA_DETECT);
+                                      psize, CPA_DETECT);
 
         /*
          * If there is a conflict, split the large page.
@@ -906,7 +914,8 @@ static void split_set_pte(struct cpa_data *cpa, pte_t *pte, unsigned long pfn,
         if (!cpa->force_static_prot)
                 goto set;
 
-        prot = static_protections(ref_prot, address, pfn, npg, CPA_PROTECT);
+        /* Hand in lpsize = 0 to enforce the protection mechanism */
+        prot = static_protections(ref_prot, address, pfn, npg, 0, CPA_PROTECT);
 
         if (pgprot_val(prot) == pgprot_val(ref_prot))
                 goto set;
@@ -1503,7 +1512,8 @@ repeat:
                 pgprot_val(new_prot) |= pgprot_val(cpa->mask_set);
 
                 cpa_inc_4k_install();
-                new_prot = static_protections(new_prot, address, pfn, 1,
+                /* Hand in lpsize = 0 to enforce the protection mechanism */
+                new_prot = static_protections(new_prot, address, pfn, 1, 0,
                                               CPA_PROTECT);
 
                 new_prot = pgprot_clear_protnone_bits(new_prot);
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index eaaed5bfc4a4..991549a1c5f3 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -390,8 +390,9 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
 
         emit_prologue(&prog, bpf_prog->aux->stack_depth,
                       bpf_prog_was_classic(bpf_prog));
+        addrs[0] = prog - temp;
 
-        for (i = 0; i < insn_cnt; i++, insn++) {
+        for (i = 1; i <= insn_cnt; i++, insn++) {
                 const s32 imm32 = insn->imm;
                 u32 dst_reg = insn->dst_reg;
                 u32 src_reg = insn->src_reg;
@@ -1105,7 +1106,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
                 extra_pass = true;
                 goto skip_init_addrs;
         }
-        addrs = kmalloc_array(prog->len, sizeof(*addrs), GFP_KERNEL);
+        addrs = kmalloc_array(prog->len + 1, sizeof(*addrs), GFP_KERNEL);
         if (!addrs) {
                 prog = orig_prog;
                 goto out_addrs;
@@ -1115,7 +1116,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
          * Before first pass, make a rough estimation of addrs[]
          * each BPF instruction is translated to less than 64 bytes
          */
-        for (proglen = 0, i = 0; i < prog->len; i++) {
+        for (proglen = 0, i = 0; i <= prog->len; i++) {
                 proglen += 64;
                 addrs[i] = proglen;
         }
@@ -1180,7 +1181,7 @@ out_image:
 
         if (!image || !prog->is_func || extra_pass) {
                 if (image)
-                        bpf_prog_fill_jited_linfo(prog, addrs);
+                        bpf_prog_fill_jited_linfo(prog, addrs + 1);
 out_addrs:
                 kfree(addrs);
                 kfree(jit_data);
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index 24b079e94bc2..c9ef6a7a4a1a 100644
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -12,6 +12,7 @@
 #include <linux/smp.h>
 #include <linux/perf_event.h>
 #include <linux/tboot.h>
+#include <linux/dmi.h>
 
 #include <asm/pgtable.h>
 #include <asm/proto.h>
@@ -23,7 +24,7 @@
 #include <asm/debugreg.h>
 #include <asm/cpu.h>
 #include <asm/mmu_context.h>
-#include <linux/dmi.h>
+#include <asm/cpu_device_id.h>
 
 #ifdef CONFIG_X86_32
 __visible unsigned long saved_context_ebx;
@@ -397,15 +398,14 @@ static int __init bsp_pm_check_init(void)
 
 core_initcall(bsp_pm_check_init);
 
-static int msr_init_context(const u32 *msr_id, const int total_num)
+static int msr_build_context(const u32 *msr_id, const int num)
 {
-        int i = 0;
+        struct saved_msrs *saved_msrs = &saved_context.saved_msrs;
         struct saved_msr *msr_array;
+        int total_num;
+        int i, j;
 
-        if (saved_context.saved_msrs.array || saved_context.saved_msrs.num > 0) {
-                pr_err("x86/pm: MSR quirk already applied, please check your DMI match table.\n");
-                return -EINVAL;
-        }
+        total_num = saved_msrs->num + num;
 
         msr_array = kmalloc_array(total_num, sizeof(struct saved_msr), GFP_KERNEL);
         if (!msr_array) {
@@ -413,19 +413,30 @@ static int msr_init_context(const u32 *msr_id, const int total_num)
                 return -ENOMEM;
         }
 
-        for (i = 0; i < total_num; i++) {
-                msr_array[i].info.msr_no        = msr_id[i];
+        if (saved_msrs->array) {
+                /*
+                 * Multiple callbacks can invoke this function, so copy any
+                 * MSR save requests from previous invocations.
+                 */
+                memcpy(msr_array, saved_msrs->array,
+                       sizeof(struct saved_msr) * saved_msrs->num);
+
+                kfree(saved_msrs->array);
+        }
+
+        for (i = saved_msrs->num, j = 0; i < total_num; i++, j++) {
+                msr_array[i].info.msr_no        = msr_id[j];
                 msr_array[i].valid              = false;
                 msr_array[i].info.reg.q         = 0;
         }
-        saved_context.saved_msrs.num    = total_num;
-        saved_context.saved_msrs.array  = msr_array;
+        saved_msrs->num   = total_num;
+        saved_msrs->array = msr_array;
 
         return 0;
 }
 
 /*
- * The following section is a quirk framework for problematic BIOSen:
+ * The following sections are a quirk framework for problematic BIOSen:
  * Sometimes MSRs are modified by the BIOSen after suspended to
  * RAM, this might cause unexpected behavior after wakeup.
  * Thus we save/restore these specified MSRs across suspend/resume
@@ -440,7 +451,7 @@ static int msr_initialize_bdw(const struct dmi_system_id *d)
         u32 bdw_msr_id[] = { MSR_IA32_THERM_CONTROL };
 
         pr_info("x86/pm: %s detected, MSR saving is needed during suspending.\n", d->ident);
-        return msr_init_context(bdw_msr_id, ARRAY_SIZE(bdw_msr_id));
+        return msr_build_context(bdw_msr_id, ARRAY_SIZE(bdw_msr_id));
 }
 
 static const struct dmi_system_id msr_save_dmi_table[] = {
@@ -455,9 +466,58 @@ static const struct dmi_system_id msr_save_dmi_table[] = {
         {}
 };
 
+static int msr_save_cpuid_features(const struct x86_cpu_id *c)
+{
+        u32 cpuid_msr_id[] = {
+                MSR_AMD64_CPUID_FN_1,
+        };
+
+        pr_info("x86/pm: family %#hx cpu detected, MSR saving is needed during suspending.\n",
+                c->family);
+
+        return msr_build_context(cpuid_msr_id, ARRAY_SIZE(cpuid_msr_id));
+}
+
+static const struct x86_cpu_id msr_save_cpu_table[] = {
+        {
+                .vendor = X86_VENDOR_AMD,
+                .family = 0x15,
+                .model = X86_MODEL_ANY,
+                .feature = X86_FEATURE_ANY,
+                .driver_data = (kernel_ulong_t)msr_save_cpuid_features,
+        },
+        {
+                .vendor = X86_VENDOR_AMD,
+                .family = 0x16,
+                .model = X86_MODEL_ANY,
+                .feature = X86_FEATURE_ANY,
+                .driver_data = (kernel_ulong_t)msr_save_cpuid_features,
+        },
+        {}
+};
+
+typedef int (*pm_cpu_match_t)(const struct x86_cpu_id *);
+static int pm_cpu_check(const struct x86_cpu_id *c)
+{
+        const struct x86_cpu_id *m;
+        int ret = 0;
+
+        m = x86_match_cpu(msr_save_cpu_table);
+        if (m) {
+                pm_cpu_match_t fn;
+
+                fn = (pm_cpu_match_t)m->driver_data;
+                ret = fn(m);
+        }
+
+        return ret;
+}
+
 static int pm_check_save_msr(void)
 {
         dmi_check_system(msr_save_dmi_table);
+        pm_cpu_check(msr_save_cpu_table);
+
         return 0;
 }
 
diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index 2e2efa577437..8c37294f1d1e 100644
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -200,7 +200,7 @@ config ATM_NICSTAR_USE_SUNI
           make the card work).
 
 config ATM_NICSTAR_USE_IDT77105
-        bool "Use IDT77015 PHY driver (25Mbps)"
+        bool "Use IDT77105 PHY driver (25Mbps)"
         depends on ATM_NICSTAR
         help
           Support for the PHYsical layer chip in ForeRunner LE25 cards. In
diff --git a/drivers/auxdisplay/ht16k33.c b/drivers/auxdisplay/ht16k33.c
index 9c0bb771751d..a2fcde582e2a 100644
--- a/drivers/auxdisplay/ht16k33.c
+++ b/drivers/auxdisplay/ht16k33.c
@@ -74,7 +74,7 @@ struct ht16k33_priv {
         struct ht16k33_fbdev fbdev;
 };
 
-static struct fb_fix_screeninfo ht16k33_fb_fix = {
+static const struct fb_fix_screeninfo ht16k33_fb_fix = {
         .id             = DRIVER_NAME,
         .type           = FB_TYPE_PACKED_PIXELS,
         .visual         = FB_VISUAL_MONO10,
@@ -85,7 +85,7 @@ static struct fb_fix_screeninfo ht16k33_fb_fix = {
         .accel          = FB_ACCEL_NONE,
 };
 
-static struct fb_var_screeninfo ht16k33_fb_var = {
+static const struct fb_var_screeninfo ht16k33_fb_var = {
         .xres = HT16K33_MATRIX_LED_MAX_ROWS,
         .yres = HT16K33_MATRIX_LED_MAX_COLS,
         .xres_virtual = HT16K33_MATRIX_LED_MAX_ROWS,
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 9bd4ddd12b25..5b248763a672 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -322,6 +322,8 @@ static int drbd_thread_setup(void *arg)
                  thi->name[0],
                  resource->name);
 
+        allow_kernel_signal(DRBD_SIGKILL);
+        allow_kernel_signal(SIGXCPU);
 restart:
         retval = thi->function(thi);
 
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 3327192bb71f..c8fb886aebd4 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3038,6 +3038,17 @@ again:
                 }
                 return true;
         case RBD_OBJ_READ_PARENT:
+                /*
+                 * The parent image is read only up to the overlap -- zero-fill
+                 * from the overlap to the end of the request.
+                 */
+                if (!*result) {
+                        u32 obj_overlap = rbd_obj_img_extents_bytes(obj_req);
+
+                        if (obj_overlap < obj_req->ex.oe_len)
+                                rbd_obj_zero_range(obj_req, obj_overlap,
+                                            obj_req->ex.oe_len - obj_overlap);
+                }
                 return true;
         default:
                 BUG();
diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index 8b33128dccee..0875470a7806 100644
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -99,6 +99,27 @@ static int qca_send_reset(struct hci_dev *hdev)
         return 0;
 }
 
+int qca_send_pre_shutdown_cmd(struct hci_dev *hdev)
+{
+        struct sk_buff *skb;
+        int err;
+
+        bt_dev_dbg(hdev, "QCA pre shutdown cmd");
+
+        skb = __hci_cmd_sync(hdev, QCA_PRE_SHUTDOWN_CMD, 0,
+                                NULL, HCI_INIT_TIMEOUT);
+        if (IS_ERR(skb)) {
+                err = PTR_ERR(skb);
+                bt_dev_err(hdev, "QCA preshutdown_cmd failed (%d)", err);
+                return err;
+        }
+
+        kfree_skb(skb);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(qca_send_pre_shutdown_cmd);
+
 static void qca_tlv_check_data(struct rome_config *config,
                                 const struct firmware *fw)
 {
@@ -119,6 +140,7 @@ static void qca_tlv_check_data(struct rome_config *config,
         BT_DBG("Length\t\t : %d bytes", length);
 
         config->dnld_mode = ROME_SKIP_EVT_NONE;
+        config->dnld_type = ROME_SKIP_EVT_NONE;
 
         switch (config->type) {
         case TLV_TYPE_PATCH:
@@ -268,7 +290,7 @@ static int qca_inject_cmd_complete_event(struct hci_dev *hdev)
 
         evt = skb_put(skb, sizeof(*evt));
         evt->ncmd = 1;
-        evt->opcode = QCA_HCI_CC_OPCODE;
+        evt->opcode = cpu_to_le16(QCA_HCI_CC_OPCODE);
 
         skb_put_u8(skb, QCA_HCI_CC_SUCCESS);
 
@@ -323,7 +345,7 @@ static int qca_download_firmware(struct hci_dev *hdev,
          */
         if (config->dnld_type == ROME_SKIP_EVT_VSE_CC ||
             config->dnld_type == ROME_SKIP_EVT_VSE)
-                return qca_inject_cmd_complete_event(hdev);
+                ret = qca_inject_cmd_complete_event(hdev);
 
 out:
         release_firmware(fw);
@@ -388,6 +410,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
                 return err;
         }
 
+        /* Give the controller some time to get ready to receive the NVM */
+        msleep(10);
+
         /* Download NVM configuration */
         config.type = TLV_TYPE_NVM;
         if (firmware_name)
diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
index 6a291a7a5d96..69c5315a65fd 100644
--- a/drivers/bluetooth/btqca.h
+++ b/drivers/bluetooth/btqca.h
@@ -13,6 +13,7 @@
 #define EDL_PATCH_TLV_REQ_CMD           (0x1E)
 #define EDL_NVM_ACCESS_SET_REQ_CMD      (0x01)
 #define MAX_SIZE_PER_TLV_SEGMENT        (243)
+#define QCA_PRE_SHUTDOWN_CMD            (0xFC08)
 
 #define EDL_CMD_REQ_RES_EVT             (0x00)
 #define EDL_PATCH_VER_RES_EVT           (0x19)
@@ -135,6 +136,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
                    const char *firmware_name);
 int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version);
 int qca_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);
+int qca_send_pre_shutdown_cmd(struct hci_dev *hdev);
 static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type)
 {
         return soc_type == QCA_WCN3990 || soc_type == QCA_WCN3998;
@@ -167,4 +169,9 @@ static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type)
 {
         return false;
 }
+
+static inline int qca_send_pre_shutdown_cmd(struct hci_dev *hdev)
+{
+        return -EOPNOTSUPP;
+}
 #endif
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 3876fee6ad13..5cf0734eb31b 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2762,8 +2762,10 @@ static int btusb_mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)
         fw_size = fw->size;
 
         /* The size of patch header is 30 bytes, should be skip */
-        if (fw_size < 30)
+        if (fw_size < 30) {
+                err = -EINVAL;
                 goto err_release_fw;
+        }
 
         fw_size -= 30;
         fw_ptr += 30;
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 82a0a3691a63..9a970fd1975a 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -705,7 +705,7 @@ static void device_want_to_sleep(struct hci_uart *hu)
         unsigned long flags;
         struct qca_data *qca = hu->priv;
 
-        BT_DBG("hu %p want to sleep", hu);
+        BT_DBG("hu %p want to sleep in %d state", hu, qca->rx_ibs_state);
 
         spin_lock_irqsave(&qca->hci_ibs_lock, flags);
 
@@ -720,7 +720,7 @@ static void device_want_to_sleep(struct hci_uart *hu)
                 break;
 
         case HCI_IBS_RX_ASLEEP:
-                /* Fall through */
+                break;
 
         default:
                 /* Any other state is illegal */
@@ -912,7 +912,7 @@ static int qca_recv_event(struct hci_dev *hdev, struct sk_buff *skb)
                 if (hdr->evt == HCI_EV_VENDOR)
                         complete(&qca->drop_ev_comp);
 
-                kfree(skb);
+                kfree_skb(skb);
 
                 return 0;
         }
@@ -1386,6 +1386,9 @@ static int qca_power_off(struct hci_dev *hdev)
 {
         struct hci_uart *hu = hci_get_drvdata(hdev);
 
+        /* Perform pre shutdown command */
+        qca_send_pre_shutdown_cmd(hdev);
+
         qca_power_shutdown(hu);
         return 0;
 }
diff --git a/drivers/bus/hisi_lpc.c b/drivers/bus/hisi_lpc.c
index 19d7b6ff2f17..20c957185af2 100644
--- a/drivers/bus/hisi_lpc.c
+++ b/drivers/bus/hisi_lpc.c
@@ -456,6 +456,17 @@ struct hisi_lpc_acpi_cell {
         size_t pdata_size;
 };
 
+static void hisi_lpc_acpi_remove(struct device *hostdev)
+{
+        struct acpi_device *adev = ACPI_COMPANION(hostdev);
+        struct acpi_device *child;
+
+        device_for_each_child(hostdev, NULL, hisi_lpc_acpi_remove_subdev);
+
+        list_for_each_entry(child, &adev->children, node)
+                acpi_device_clear_enumerated(child);
+}
+
 /*
  * hisi_lpc_acpi_probe - probe children for ACPI FW
  * @hostdev: LPC host device pointer
@@ -555,8 +566,7 @@ static int hisi_lpc_acpi_probe(struct device *hostdev)
         return 0;
 
 fail:
-        device_for_each_child(hostdev, NULL,
-                              hisi_lpc_acpi_remove_subdev);
+        hisi_lpc_acpi_remove(hostdev);
         return ret;
 }
 
@@ -569,6 +579,10 @@ static int hisi_lpc_acpi_probe(struct device *dev)
 {
         return -ENODEV;
 }
+
+static void hisi_lpc_acpi_remove(struct device *hostdev)
+{
+}
 #endif // CONFIG_ACPI
 
 /*
@@ -606,24 +620,27 @@ static int hisi_lpc_probe(struct platform_device *pdev)
         range->fwnode = dev->fwnode;
         range->flags = LOGIC_PIO_INDIRECT;
         range->size = PIO_INDIRECT_SIZE;
+        range->hostdata = lpcdev;
+        range->ops = &hisi_lpc_ops;
+        lpcdev->io_host = range;
 
         ret = logic_pio_register_range(range);
         if (ret) {
                 dev_err(dev, "register IO range failed (%d)!\n", ret);
                 return ret;
         }
-        lpcdev->io_host = range;
 
         /* register the LPC host PIO resources */
         if (acpi_device)
                 ret = hisi_lpc_acpi_probe(dev);
         else
                 ret = of_platform_populate(dev->of_node, NULL, NULL, dev);
-        if (ret)
+        if (ret) {
+                logic_pio_unregister_range(range);
                 return ret;
+        }
 
-        lpcdev->io_host->hostdata = lpcdev;
-        lpcdev->io_host->ops = &hisi_lpc_ops;
+        dev_set_drvdata(dev, lpcdev);
 
         io_end = lpcdev->io_host->io_start + lpcdev->io_host->size;
         dev_info(dev, "registered range [%pa - %pa]\n",
@@ -632,6 +649,23 @@ static int hisi_lpc_probe(struct platform_device *pdev)
         return ret;
 }
 
+static int hisi_lpc_remove(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct acpi_device *acpi_device = ACPI_COMPANION(dev);
+        struct hisi_lpc_dev *lpcdev = dev_get_drvdata(dev);
+        struct logic_pio_hwaddr *range = lpcdev->io_host;
+
+        if (acpi_device)
+                hisi_lpc_acpi_remove(dev);
+        else
+                of_platform_depopulate(dev);
+
+        logic_pio_unregister_range(range);
+
+        return 0;
+}
+
 static const struct of_device_id hisi_lpc_of_match[] = {
         { .compatible = "hisilicon,hip06-lpc", },
         { .compatible = "hisilicon,hip07-lpc", },
@@ -645,5 +679,6 @@ static struct platform_driver hisi_lpc_driver = {
                 .acpi_match_table = ACPI_PTR(hisi_lpc_acpi_match),
         },
         .probe = hisi_lpc_probe,
+        .remove = hisi_lpc_remove,
 };
 builtin_platform_driver(hisi_lpc_driver);
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index e6deabd8305d..2db474ab4c6b 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -949,7 +949,7 @@ static int sysc_best_idle_mode(u32 idlemodes, u32 *best_mode)
                 *best_mode = SYSC_IDLE_SMART_WKUP;
         else if (idlemodes & BIT(SYSC_IDLE_SMART))
                 *best_mode = SYSC_IDLE_SMART;
-        else if (idlemodes & SYSC_IDLE_FORCE)
+        else if (idlemodes & BIT(SYSC_IDLE_FORCE))
                 *best_mode = SYSC_IDLE_FORCE;
         else
                 return -EINVAL;
@@ -1267,7 +1267,8 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {
         SYSC_QUIRK("control", 0, 0, 0x10, -1, 0x40000900, 0xffffffff, 0),
         SYSC_QUIRK("cpgmac", 0, 0x1200, 0x1208, 0x1204, 0x4edb1902,
                    0xffff00f0, 0),
-        SYSC_QUIRK("dcan", 0, 0, -1, -1, 0xffffffff, 0xffffffff, 0),
+        SYSC_QUIRK("dcan", 0, 0x20, -1, -1, 0xa3170504, 0xffffffff, 0),
+        SYSC_QUIRK("dcan", 0, 0x20, -1, -1, 0x4edb1902, 0xffffffff, 0),
         SYSC_QUIRK("dmic", 0, 0, 0x10, -1, 0x50010000, 0xffffffff, 0),
         SYSC_QUIRK("dwc3", 0, 0, 0x10, -1, 0x500a0200, 0xffffffff, 0),
         SYSC_QUIRK("epwmss", 0, 0, 0x4, -1, 0x47400001, 0xffffffff, 0),
@@ -1692,10 +1693,7 @@ static int sysc_init_sysc_mask(struct sysc *ddata)
         if (error)
                 return 0;
 
-        if (val)
-                ddata->cfg.sysc_val = val & ddata->cap->sysc_mask;
-        else
-                ddata->cfg.sysc_val = ddata->cap->sysc_mask;
+        ddata->cfg.sysc_val = val & ddata->cap->sysc_mask;
 
         return 0;
 }
@@ -2385,27 +2383,27 @@ static int sysc_probe(struct platform_device *pdev)
 
         error = sysc_init_dts_quirks(ddata);
         if (error)
-                goto unprepare;
+                return error;
 
         error = sysc_map_and_check_registers(ddata);
         if (error)
-                goto unprepare;
+                return error;
 
         error = sysc_init_sysc_mask(ddata);
         if (error)
-                goto unprepare;
+                return error;
 
         error = sysc_init_idlemodes(ddata);
         if (error)
-                goto unprepare;
+                return error;
 
         error = sysc_init_syss_mask(ddata);
         if (error)
-                goto unprepare;
+                return error;
 
         error = sysc_init_pdata(ddata);
         if (error)
-                goto unprepare;
+                return error;
 
         sysc_init_early_quirks(ddata);
 
@@ -2415,7 +2413,7 @@ static int sysc_probe(struct platform_device *pdev)
 
         error = sysc_init_resets(ddata);
         if (error)
-                return error;
+                goto unprepare;
 
         error = sysc_init_module(ddata);
         if (error)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index c0990703ce54..1c46babeb093 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -324,6 +324,25 @@ static struct clk_core *clk_core_lookup(const char *name)
         return NULL;
 }
 
+#ifdef CONFIG_OF
+static int of_parse_clkspec(const struct device_node *np, int index,
+                            const char *name, struct of_phandle_args *out_args);
+static struct clk_hw *
+of_clk_get_hw_from_clkspec(struct of_phandle_args *clkspec);
+#else
+static inline int of_parse_clkspec(const struct device_node *np, int index,
+                                   const char *name,
+                                   struct of_phandle_args *out_args)
+{
+        return -ENOENT;
+}
+static inline struct clk_hw *
+of_clk_get_hw_from_clkspec(struct of_phandle_args *clkspec)
+{
+        return ERR_PTR(-ENOENT);
+}
+#endif
+
 /**
  * clk_core_get - Find the clk_core parent of a clk
  * @core: clk to find parent of
@@ -355,8 +374,9 @@ static struct clk_core *clk_core_lookup(const char *name)
  *      };
  *
  * Returns: -ENOENT when the provider can't be found or the clk doesn't
- * exist in the provider. -EINVAL when the name can't be found. NULL when the
- * provider knows about the clk but it isn't provided on this system.
+ * exist in the provider or the name can't be found in the DT node or
+ * in a clkdev lookup. NULL when the provider knows about the clk but it
+ * isn't provided on this system.
  * A valid clk_core pointer when the clk can be found in the provider.
  */
 static struct clk_core *clk_core_get(struct clk_core *core, u8 p_index)
@@ -367,17 +387,19 @@ static struct clk_core *clk_core_get(struct clk_core *core, u8 p_index)
         struct device *dev = core->dev;
         const char *dev_id = dev ? dev_name(dev) : NULL;
         struct device_node *np = core->of_node;
+        struct of_phandle_args clkspec;
 
-        if (np && (name || index >= 0))
-                hw = of_clk_get_hw(np, index, name);
-
-        /*
-         * If the DT search above couldn't find the provider or the provider
-         * didn't know about this clk, fallback to looking up via clkdev based
-         * clk_lookups
-         */
-        if (PTR_ERR(hw) == -ENOENT && name)
+        if (np && (name || index >= 0) &&
+            !of_parse_clkspec(np, index, name, &clkspec)) {
+                hw = of_clk_get_hw_from_clkspec(&clkspec);
+                of_node_put(clkspec.np);
+        } else if (name) {
+                /*
+                 * If the DT search above couldn't find the provider fallback to
+                 * looking up via clkdev based clk_lookups.
+                 */
                 hw = clk_find_hw(dev_id, name);
+        }
 
         if (IS_ERR(hw))
                 return ERR_CAST(hw);
@@ -401,7 +423,7 @@ static void clk_core_fill_parent_index(struct clk_core *core, u8 index)
                         parent = ERR_PTR(-EPROBE_DEFER);
         } else {
                 parent = clk_core_get(core, index);
-                if (IS_ERR(parent) && PTR_ERR(parent) == -ENOENT)
+                if (IS_ERR(parent) && PTR_ERR(parent) == -ENOENT && entry->name)
                         parent = clk_core_lookup(entry->name);
         }
 
@@ -1632,7 +1654,8 @@ static int clk_fetch_parent_index(struct clk_core *core,
                         break;
 
                 /* Fallback to comparing globally unique names */
-                if (!strcmp(parent->name, core->parents[i].name))
+                if (core->parents[i].name &&
+                    !strcmp(parent->name, core->parents[i].name))
                         break;
         }
 
diff --git a/drivers/clk/samsung/clk-exynos5-subcmu.c b/drivers/clk/samsung/clk-exynos5-subcmu.c
index 91db7894125d..65c82d922b05 100644
--- a/drivers/clk/samsung/clk-exynos5-subcmu.c
+++ b/drivers/clk/samsung/clk-exynos5-subcmu.c
@@ -14,7 +14,7 @@
 #include "clk-exynos5-subcmu.h"
 
 static struct samsung_clk_provider *ctx;
-static const struct exynos5_subcmu_info *cmu;
+static const struct exynos5_subcmu_info **cmu;
 static int nr_cmus;
 
 static void exynos5_subcmu_clk_save(void __iomem *base,
@@ -56,17 +56,17 @@ static void exynos5_subcmu_defer_gate(struct samsung_clk_provider *ctx,
  * when OF-core populates all device-tree nodes.
  */
 void exynos5_subcmus_init(struct samsung_clk_provider *_ctx, int _nr_cmus,
-                          const struct exynos5_subcmu_info *_cmu)
+                          const struct exynos5_subcmu_info **_cmu)
 {
         ctx = _ctx;
         cmu = _cmu;
         nr_cmus = _nr_cmus;
 
         for (; _nr_cmus--; _cmu++) {
-                exynos5_subcmu_defer_gate(ctx, _cmu->gate_clks,
-                                          _cmu->nr_gate_clks);
-                exynos5_subcmu_clk_save(ctx->reg_base, _cmu->suspend_regs,
-                                        _cmu->nr_suspend_regs);
+                exynos5_subcmu_defer_gate(ctx, (*_cmu)->gate_clks,
+                                          (*_cmu)->nr_gate_clks);
+                exynos5_subcmu_clk_save(ctx->reg_base, (*_cmu)->suspend_regs,
+                                        (*_cmu)->nr_suspend_regs);
         }
 }
 
@@ -163,9 +163,9 @@ static int __init exynos5_clk_probe(struct platform_device *pdev)
                 if (of_property_read_string(np, "label", &name) < 0)
                         continue;
                 for (i = 0; i < nr_cmus; i++)
-                        if (strcmp(cmu[i].pd_name, name) == 0)
+                        if (strcmp(cmu[i]->pd_name, name) == 0)
                                 exynos5_clk_register_subcmu(&pdev->dev,
-                                                            &cmu[i], np);
+                                                            cmu[i], np);
         }
         return 0;
 }
diff --git a/drivers/clk/samsung/clk-exynos5-subcmu.h b/drivers/clk/samsung/clk-exynos5-subcmu.h
index 755ee8aaa3de..9ae5356f25aa 100644
--- a/drivers/clk/samsung/clk-exynos5-subcmu.h
+++ b/drivers/clk/samsung/clk-exynos5-subcmu.h
@@ -21,6 +21,6 @@ struct exynos5_subcmu_info {
 };
 
 void exynos5_subcmus_init(struct samsung_clk_provider *ctx, int nr_cmus,
-                          const struct exynos5_subcmu_info *cmu);
+                          const struct exynos5_subcmu_info **cmu);
 
 #endif
diff --git a/drivers/clk/samsung/clk-exynos5250.c b/drivers/clk/samsung/clk-exynos5250.c
index f2b896881768..931c70a4da19 100644
--- a/drivers/clk/samsung/clk-exynos5250.c
+++ b/drivers/clk/samsung/clk-exynos5250.c
@@ -681,6 +681,10 @@ static const struct exynos5_subcmu_info exynos5250_disp_subcmu = {
         .pd_name        = "DISP1",
 };
 
+static const struct exynos5_subcmu_info *exynos5250_subcmus[] = {
+        &exynos5250_disp_subcmu,
+};
+
 static const struct samsung_pll_rate_table vpll_24mhz_tbl[] __initconst = {
         /* sorted in descending order */
         /* PLL_36XX_RATE(rate, m, p, s, k) */
@@ -843,7 +847,8 @@ static void __init exynos5250_clk_init(struct device_node *np)
 
         samsung_clk_sleep_init(reg_base, exynos5250_clk_regs,
                                ARRAY_SIZE(exynos5250_clk_regs));
-        exynos5_subcmus_init(ctx, 1, &exynos5250_disp_subcmu);
+        exynos5_subcmus_init(ctx, ARRAY_SIZE(exynos5250_subcmus),
+                             exynos5250_subcmus);
 
         samsung_clk_of_add_provider(np, ctx);
 
diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c
index 01bca5a498b2..7670cc596c74 100644
--- a/drivers/clk/samsung/clk-exynos5420.c
+++ b/drivers/clk/samsung/clk-exynos5420.c
@@ -534,8 +534,6 @@ static const struct samsung_gate_clock exynos5800_gate_clks[] __initconst = {
                                 GATE_BUS_TOP, 24, 0, 0),
         GATE(CLK_ACLK432_SCALER, "aclk432_scaler", "mout_user_aclk432_scaler",
                                 GATE_BUS_TOP, 27, CLK_IS_CRITICAL, 0),
-        GATE(CLK_MAU_EPLL, "mau_epll", "mout_user_mau_epll",
-                        SRC_MASK_TOP7, 20, CLK_SET_RATE_PARENT, 0),
 };
 
 static const struct samsung_mux_clock exynos5420_mux_clks[] __initconst = {
@@ -577,8 +575,13 @@ static const struct samsung_div_clock exynos5420_div_clks[] __initconst = {
 
 static const struct samsung_gate_clock exynos5420_gate_clks[] __initconst = {
         GATE(CLK_SECKEY, "seckey", "aclk66_psgen", GATE_BUS_PERIS1, 1, 0, 0),
+        /* Maudio Block */
         GATE(CLK_MAU_EPLL, "mau_epll", "mout_mau_epll_clk",
                         SRC_MASK_TOP7, 20, CLK_SET_RATE_PARENT, 0),
+        GATE(CLK_SCLK_MAUDIO0, "sclk_maudio0", "dout_maudio0",
+                GATE_TOP_SCLK_MAU, 0, CLK_SET_RATE_PARENT, 0),
+        GATE(CLK_SCLK_MAUPCM0, "sclk_maupcm0", "dout_maupcm0",
+                GATE_TOP_SCLK_MAU, 1, CLK_SET_RATE_PARENT, 0),
 };
 
 static const struct samsung_mux_clock exynos5x_mux_clks[] __initconst = {
@@ -890,9 +893,6 @@ static const struct samsung_div_clock exynos5x_div_clks[] __initconst = {
         /* GSCL Block */
         DIV(0, "dout_gscl_blk_333", "aclk333_432_gscl", DIV2_RATIO0, 6, 2),
 
-        /* MSCL Block */
-        DIV(0, "dout_mscl_blk", "aclk400_mscl", DIV2_RATIO0, 28, 2),
-
         /* PSGEN */
         DIV(0, "dout_gen_blk", "mout_user_aclk266", DIV2_RATIO0, 8, 1),
         DIV(0, "dout_jpg_blk", "aclk166", DIV2_RATIO0, 20, 1),
@@ -1017,12 +1017,6 @@ static const struct samsung_gate_clock exynos5x_gate_clks[] __initconst = {
         GATE(CLK_SCLK_DP1, "sclk_dp1", "dout_dp1",
                         GATE_TOP_SCLK_DISP1, 20, CLK_SET_RATE_PARENT, 0),
 
-        /* Maudio Block */
-        GATE(CLK_SCLK_MAUDIO0, "sclk_maudio0", "dout_maudio0",
-                GATE_TOP_SCLK_MAU, 0, CLK_SET_RATE_PARENT, 0),
-        GATE(CLK_SCLK_MAUPCM0, "sclk_maupcm0", "dout_maupcm0",
-                GATE_TOP_SCLK_MAU, 1, CLK_SET_RATE_PARENT, 0),
-
         /* FSYS Block */
         GATE(CLK_TSI, "tsi", "aclk200_fsys", GATE_BUS_FSYS0, 0, 0, 0),
         GATE(CLK_PDMA0, "pdma0", "aclk200_fsys", GATE_BUS_FSYS0, 1, 0, 0),
@@ -1162,17 +1156,6 @@ static const struct samsung_gate_clock exynos5x_gate_clks[] __initconst = {
         GATE(CLK_FIMC_LITE3, "fimc_lite3", "aclk333_432_gscl",
                         GATE_IP_GSCL1, 17, 0, 0),
 
-        /* MSCL Block */
-        GATE(CLK_MSCL0, "mscl0", "aclk400_mscl", GATE_IP_MSCL, 0, 0, 0),
-        GATE(CLK_MSCL1, "mscl1", "aclk400_mscl", GATE_IP_MSCL, 1, 0, 0),
-        GATE(CLK_MSCL2, "mscl2", "aclk400_mscl", GATE_IP_MSCL, 2, 0, 0),
-        GATE(CLK_SMMU_MSCL0, "smmu_mscl0", "dout_mscl_blk",
-                        GATE_IP_MSCL, 8, 0, 0),
-        GATE(CLK_SMMU_MSCL1, "smmu_mscl1", "dout_mscl_blk",
-                        GATE_IP_MSCL, 9, 0, 0),
-        GATE(CLK_SMMU_MSCL2, "smmu_mscl2", "dout_mscl_blk",
-                        GATE_IP_MSCL, 10, 0, 0),
-
         /* ISP */
         GATE(CLK_SCLK_UART_ISP, "sclk_uart_isp", "dout_uart_isp",
                         GATE_TOP_SCLK_ISP, 0, CLK_SET_RATE_PARENT, 0),
@@ -1281,32 +1264,103 @@ static struct exynos5_subcmu_reg_dump exynos5x_mfc_suspend_regs[] = {
         { DIV4_RATIO, 0, 0x3 },                 /* DIV dout_mfc_blk */
 };
 
-static const struct exynos5_subcmu_info exynos5x_subcmus[] = {
-        {
-                .div_clks       = exynos5x_disp_div_clks,
-                .nr_div_clks    = ARRAY_SIZE(exynos5x_disp_div_clks),
-                .gate_clks      = exynos5x_disp_gate_clks,
-                .nr_gate_clks   = ARRAY_SIZE(exynos5x_disp_gate_clks),
-                .suspend_regs   = exynos5x_disp_suspend_regs,
-                .nr_suspend_regs = ARRAY_SIZE(exynos5x_disp_suspend_regs),
-                .pd_name        = "DISP",
-        }, {
-                .div_clks       = exynos5x_gsc_div_clks,
-                .nr_div_clks    = ARRAY_SIZE(exynos5x_gsc_div_clks),
-                .gate_clks      = exynos5x_gsc_gate_clks,
-                .nr_gate_clks   = ARRAY_SIZE(exynos5x_gsc_gate_clks),
-                .suspend_regs   = exynos5x_gsc_suspend_regs,
-                .nr_suspend_regs = ARRAY_SIZE(exynos5x_gsc_suspend_regs),
-                .pd_name        = "GSC",
-        }, {
-                .div_clks       = exynos5x_mfc_div_clks,
-                .nr_div_clks    = ARRAY_SIZE(exynos5x_mfc_div_clks),
-                .gate_clks      = exynos5x_mfc_gate_clks,
-                .nr_gate_clks   = ARRAY_SIZE(exynos5x_mfc_gate_clks),
-                .suspend_regs   = exynos5x_mfc_suspend_regs,
-                .nr_suspend_regs = ARRAY_SIZE(exynos5x_mfc_suspend_regs),
-                .pd_name        = "MFC",
-        },
+static const struct samsung_gate_clock exynos5x_mscl_gate_clks[] __initconst = {
+        /* MSCL Block */
+        GATE(CLK_MSCL0, "mscl0", "aclk400_mscl", GATE_IP_MSCL, 0, 0, 0),
+        GATE(CLK_MSCL1, "mscl1", "aclk400_mscl", GATE_IP_MSCL, 1, 0, 0),
+        GATE(CLK_MSCL2, "mscl2", "aclk400_mscl", GATE_IP_MSCL, 2, 0, 0),
+        GATE(CLK_SMMU_MSCL0, "smmu_mscl0", "dout_mscl_blk",
+                        GATE_IP_MSCL, 8, 0, 0),
+        GATE(CLK_SMMU_MSCL1, "smmu_mscl1", "dout_mscl_blk",
+                        GATE_IP_MSCL, 9, 0, 0),
+        GATE(CLK_SMMU_MSCL2, "smmu_mscl2", "dout_mscl_blk",
+                        GATE_IP_MSCL, 10, 0, 0),
+};
+
+static const struct samsung_div_clock exynos5x_mscl_div_clks[] __initconst = {
+        DIV(0, "dout_mscl_blk", "aclk400_mscl", DIV2_RATIO0, 28, 2),
+};
+
+static struct exynos5_subcmu_reg_dump exynos5x_mscl_suspend_regs[] = {
+        { GATE_IP_MSCL, 0xffffffff, 0xffffffff }, /* MSCL gates */
+        { SRC_TOP3, 0, BIT(4) },                /* MUX mout_user_aclk400_mscl */
+        { DIV2_RATIO0, 0, 0x30000000 },         /* DIV dout_mscl_blk */
+};
+
+static const struct samsung_gate_clock exynos5800_mau_gate_clks[] __initconst = {
+        GATE(CLK_MAU_EPLL, "mau_epll", "mout_user_mau_epll",
+                        SRC_MASK_TOP7, 20, CLK_SET_RATE_PARENT, 0),
+        GATE(CLK_SCLK_MAUDIO0, "sclk_maudio0", "dout_maudio0",
+                GATE_TOP_SCLK_MAU, 0, CLK_SET_RATE_PARENT, 0),
+        GATE(CLK_SCLK_MAUPCM0, "sclk_maupcm0", "dout_maupcm0",
+                GATE_TOP_SCLK_MAU, 1, CLK_SET_RATE_PARENT, 0),
+};
+
+static struct exynos5_subcmu_reg_dump exynos5800_mau_suspend_regs[] = {
+        { SRC_TOP9, 0, BIT(8) },        /* MUX mout_user_mau_epll */
+};
+
+static const struct exynos5_subcmu_info exynos5x_disp_subcmu = {
+        .div_clks       = exynos5x_disp_div_clks,
+        .nr_div_clks    = ARRAY_SIZE(exynos5x_disp_div_clks),
+        .gate_clks      = exynos5x_disp_gate_clks,
+        .nr_gate_clks   = ARRAY_SIZE(exynos5x_disp_gate_clks),
+        .suspend_regs   = exynos5x_disp_suspend_regs,
+        .nr_suspend_regs = ARRAY_SIZE(exynos5x_disp_suspend_regs),
+        .pd_name        = "DISP",
+};
+
+static const struct exynos5_subcmu_info exynos5x_gsc_subcmu = {
+        .div_clks       = exynos5x_gsc_div_clks,
+        .nr_div_clks    = ARRAY_SIZE(exynos5x_gsc_div_clks),
+        .gate_clks      = exynos5x_gsc_gate_clks,
+        .nr_gate_clks   = ARRAY_SIZE(exynos5x_gsc_gate_clks),
+        .suspend_regs   = exynos5x_gsc_suspend_regs,
+        .nr_suspend_regs = ARRAY_SIZE(exynos5x_gsc_suspend_regs),
+        .pd_name        = "GSC",
+};
+
+static const struct exynos5_subcmu_info exynos5x_mfc_subcmu = {
+        .div_clks       = exynos5x_mfc_div_clks,
+        .nr_div_clks    = ARRAY_SIZE(exynos5x_mfc_div_clks),
+        .gate_clks      = exynos5x_mfc_gate_clks,
+        .nr_gate_clks   = ARRAY_SIZE(exynos5x_mfc_gate_clks),
+        .suspend_regs   = exynos5x_mfc_suspend_regs,
+        .nr_suspend_regs = ARRAY_SIZE(exynos5x_mfc_suspend_regs),
+        .pd_name        = "MFC",
+};
+
+static const struct exynos5_subcmu_info exynos5x_mscl_subcmu = {
+        .div_clks       = exynos5x_mscl_div_clks,
+        .nr_div_clks    = ARRAY_SIZE(exynos5x_mscl_div_clks),
+        .gate_clks      = exynos5x_mscl_gate_clks,
+        .nr_gate_clks   = ARRAY_SIZE(exynos5x_mscl_gate_clks),
+        .suspend_regs   = exynos5x_mscl_suspend_regs,
+        .nr_suspend_regs = ARRAY_SIZE(exynos5x_mscl_suspend_regs),
+        .pd_name        = "MSC",
+};
+
+static const struct exynos5_subcmu_info exynos5800_mau_subcmu = {
+        .gate_clks      = exynos5800_mau_gate_clks,
+        .nr_gate_clks   = ARRAY_SIZE(exynos5800_mau_gate_clks),
+        .suspend_regs   = exynos5800_mau_suspend_regs,
+        .nr_suspend_regs = ARRAY_SIZE(exynos5800_mau_suspend_regs),
+        .pd_name        = "MAU",
+};
+
+static const struct exynos5_subcmu_info *exynos5x_subcmus[] = {
+        &exynos5x_disp_subcmu,
+        &exynos5x_gsc_subcmu,
+        &exynos5x_mfc_subcmu,
+        &exynos5x_mscl_subcmu,
+};
+
+static const struct exynos5_subcmu_info *exynos5800_subcmus[] = {
+        &exynos5x_disp_subcmu,
+        &exynos5x_gsc_subcmu,
+        &exynos5x_mfc_subcmu,
+        &exynos5x_mscl_subcmu,
+        &exynos5800_mau_subcmu,
 };
 
 static const struct samsung_pll_rate_table exynos5420_pll2550x_24mhz_tbl[] __initconst = {
@@ -1539,11 +1593,17 @@ static void __init exynos5x_clk_init(struct device_node *np,
         samsung_clk_extended_sleep_init(reg_base,
                 exynos5x_clk_regs, ARRAY_SIZE(exynos5x_clk_regs),
                 exynos5420_set_clksrc, ARRAY_SIZE(exynos5420_set_clksrc));
-        if (soc == EXYNOS5800)
+
+        if (soc == EXYNOS5800) {
                 samsung_clk_sleep_init(reg_base, exynos5800_clk_regs,
                                        ARRAY_SIZE(exynos5800_clk_regs));
-        exynos5_subcmus_init(ctx, ARRAY_SIZE(exynos5x_subcmus),
-                             exynos5x_subcmus);
+
+                exynos5_subcmus_init(ctx, ARRAY_SIZE(exynos5800_subcmus),
+                                     exynos5800_subcmus);
+        } else {
+                exynos5_subcmus_init(ctx, ARRAY_SIZE(exynos5x_subcmus),
+                                     exynos5x_subcmus);
+        }
 
         samsung_clk_of_add_provider(np, ctx);
 }
diff --git a/drivers/clk/socfpga/clk-periph-s10.c b/drivers/clk/socfpga/clk-periph-s10.c
index 5c50e723ecae..1a191eeeebba 100644
--- a/drivers/clk/socfpga/clk-periph-s10.c
+++ b/drivers/clk/socfpga/clk-periph-s10.c
@@ -38,7 +38,7 @@ static unsigned long clk_peri_cnt_clk_recalc_rate(struct clk_hw *hwclk,
         if (socfpgaclk->fixed_div) {
                 div = socfpgaclk->fixed_div;
         } else {
-                if (!socfpgaclk->bypass_reg)
+                if (socfpgaclk->hw.reg)
                         div = ((readl(socfpgaclk->hw.reg) & 0x7ff) + 1);
         }
 
diff --git a/drivers/crypto/ccp/ccp-dev.c b/drivers/crypto/ccp/ccp-dev.c
index f79eede71c62..edefa669153f 100644
--- a/drivers/crypto/ccp/ccp-dev.c
+++ b/drivers/crypto/ccp/ccp-dev.c
@@ -540,6 +540,10 @@ int ccp_dev_suspend(struct sp_device *sp, pm_message_t state)
         unsigned long flags;
         unsigned int i;
 
+        /* If there's no device there's nothing to do */
+        if (!ccp)
+                return 0;
+
         spin_lock_irqsave(&ccp->cmd_lock, flags);
 
         ccp->suspending = 1;
@@ -564,6 +568,10 @@ int ccp_dev_resume(struct sp_device *sp)
         unsigned long flags;
         unsigned int i;
 
+        /* If there's no device there's nothing to do */
+        if (!ccp)
+                return 0;
+
         spin_lock_irqsave(&ccp->cmd_lock, flags);
 
         ccp->suspending = 0;
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 23e0a356f167..ad72b3f42ffa 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -1163,6 +1163,7 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev,
         switch (chan->feature & FSL_DMA_IP_MASK) {
         case FSL_DMA_IP_85XX:
                 chan->toggle_ext_pause = fsl_chan_toggle_ext_pause;
+                /* Fall through */
         case FSL_DMA_IP_83XX:
                 chan->toggle_ext_start = fsl_chan_toggle_ext_start;
                 chan->set_src_loop_size = fsl_chan_set_src_loop_size;
diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c
index 9c41a4e42575..1072c450c37a 100644
--- a/drivers/dma/sh/rcar-dmac.c
+++ b/drivers/dma/sh/rcar-dmac.c
@@ -192,6 +192,7 @@ struct rcar_dmac_chan {
  * @iomem: remapped I/O memory base
  * @n_channels: number of available channels
  * @channels: array of DMAC channels
+ * @channels_mask: bitfield of which DMA channels are managed by this driver
  * @modules: bitmask of client modules in use
  */
 struct rcar_dmac {
@@ -202,6 +203,7 @@ struct rcar_dmac {
 
         unsigned int n_channels;
         struct rcar_dmac_chan *channels;
+        unsigned int channels_mask;
 
         DECLARE_BITMAP(modules, 256);
 };
@@ -438,7 +440,7 @@ static int rcar_dmac_init(struct rcar_dmac *dmac)
         u16 dmaor;
 
         /* Clear all channels and enable the DMAC globally. */
-        rcar_dmac_write(dmac, RCAR_DMACHCLR, GENMASK(dmac->n_channels - 1, 0));
+        rcar_dmac_write(dmac, RCAR_DMACHCLR, dmac->channels_mask);
         rcar_dmac_write(dmac, RCAR_DMAOR,
                         RCAR_DMAOR_PRI_FIXED | RCAR_DMAOR_DME);
 
@@ -814,6 +816,9 @@ static void rcar_dmac_stop_all_chan(struct rcar_dmac *dmac)
         for (i = 0; i < dmac->n_channels; ++i) {
                 struct rcar_dmac_chan *chan = &dmac->channels[i];
 
+                if (!(dmac->channels_mask & BIT(i)))
+                        continue;
+
                 /* Stop and reinitialize the channel. */
                 spin_lock_irq(&chan->lock);
                 rcar_dmac_chan_halt(chan);
@@ -1776,6 +1781,8 @@ static int rcar_dmac_chan_probe(struct rcar_dmac *dmac,
         return 0;
 }
 
+#define RCAR_DMAC_MAX_CHANNELS  32
+
 static int rcar_dmac_parse_of(struct device *dev, struct rcar_dmac *dmac)
 {
         struct device_node *np = dev->of_node;
@@ -1787,12 +1794,16 @@ static int rcar_dmac_parse_of(struct device *dev, struct rcar_dmac *dmac)
                 return ret;
         }
 
-        if (dmac->n_channels <= 0 || dmac->n_channels >= 100) {
+        /* The hardware and driver don't support more than 32 bits in CHCLR */
+        if (dmac->n_channels <= 0 ||
+            dmac->n_channels >= RCAR_DMAC_MAX_CHANNELS) {
                 dev_err(dev, "invalid number of channels %u\n",
                         dmac->n_channels);
                 return -EINVAL;
         }
 
+        dmac->channels_mask = GENMASK(dmac->n_channels - 1, 0);
+
         return 0;
 }
 
@@ -1802,7 +1813,6 @@ static int rcar_dmac_probe(struct platform_device *pdev)
                 DMA_SLAVE_BUSWIDTH_2_BYTES | DMA_SLAVE_BUSWIDTH_4_BYTES |
                 DMA_SLAVE_BUSWIDTH_8_BYTES | DMA_SLAVE_BUSWIDTH_16_BYTES |
                 DMA_SLAVE_BUSWIDTH_32_BYTES | DMA_SLAVE_BUSWIDTH_64_BYTES;
-        unsigned int channels_offset = 0;
         struct dma_device *engine;
         struct rcar_dmac *dmac;
         struct resource *mem;
@@ -1831,10 +1841,8 @@ static int rcar_dmac_probe(struct platform_device *pdev)
          * level we can't disable it selectively, so ignore channel 0 for now if
          * the device is part of an IOMMU group.
          */
-        if (device_iommu_mapped(&pdev->dev)) {
-                dmac->n_channels--;
-                channels_offset = 1;
-        }
+        if (device_iommu_mapped(&pdev->dev))
+                dmac->channels_mask &= ~BIT(0);
 
         dmac->channels = devm_kcalloc(&pdev->dev, dmac->n_channels,
                                       sizeof(*dmac->channels), GFP_KERNEL);
@@ -1892,8 +1900,10 @@ static int rcar_dmac_probe(struct platform_device *pdev)
         INIT_LIST_HEAD(&engine->channels);
 
         for (i = 0; i < dmac->n_channels; ++i) {
-                ret = rcar_dmac_chan_probe(dmac, &dmac->channels[i],
-                                           i + channels_offset);
+                if (!(dmac->channels_mask & BIT(i)))
+                        continue;
+
+                ret = rcar_dmac_chan_probe(dmac, &dmac->channels[i], i);
                 if (ret < 0)
                         goto error;
         }
diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c
index baac476c8622..525dc7338fe3 100644
--- a/drivers/dma/sprd-dma.c
+++ b/drivers/dma/sprd-dma.c
@@ -908,6 +908,7 @@ sprd_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
         struct sprd_dma_chn *schan = to_sprd_dma_chan(chan);
         struct dma_slave_config *slave_cfg = &schan->slave_cfg;
         dma_addr_t src = 0, dst = 0;
+        dma_addr_t start_src = 0, start_dst = 0;
         struct sprd_dma_desc *sdesc;
         struct scatterlist *sg;
         u32 len = 0;
@@ -954,6 +955,11 @@ sprd_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                         dst = sg_dma_address(sg);
                 }
 
+                if (!i) {
+                        start_src = src;
+                        start_dst = dst;
+                }
+
                 /*
                  * The link-list mode needs at least 2 link-list
                  * configurations. If there is only one sg, it doesn't
@@ -970,8 +976,8 @@ sprd_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                 }
         }
 
-        ret = sprd_dma_fill_desc(chan, &sdesc->chn_hw, 0, 0, src, dst, len,
-                                 dir, flags, slave_cfg);
+        ret = sprd_dma_fill_desc(chan, &sdesc->chn_hw, 0, 0, start_src,
+                                 start_dst, len, dir, flags, slave_cfg);
         if (ret) {
                 kfree(sdesc);
                 return NULL;
diff --git a/drivers/dma/ti/dma-crossbar.c b/drivers/dma/ti/dma-crossbar.c
index ad2f0a4cd6a4..f255056696ee 100644
--- a/drivers/dma/ti/dma-crossbar.c
+++ b/drivers/dma/ti/dma-crossbar.c
@@ -391,8 +391,10 @@ static int ti_dra7_xbar_probe(struct platform_device *pdev)
 
                 ret = of_property_read_u32_array(node, pname, (u32 *)rsv_events,
                                                  nelm * 2);
-                if (ret)
+                if (ret) {
+                        kfree(rsv_events);
                         return ret;
+                }
 
                 for (i = 0; i < nelm; i++) {
                         ti_dra7_xbar_reserve(rsv_events[i][0], rsv_events[i][1],
diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
index ba27802efcd0..d07c0d5de7a2 100644
--- a/drivers/dma/ti/omap-dma.c
+++ b/drivers/dma/ti/omap-dma.c
@@ -1540,8 +1540,10 @@ static int omap_dma_probe(struct platform_device *pdev)
 
                 rc = devm_request_irq(&pdev->dev, irq, omap_dma_irq,
                                       IRQF_SHARED, "omap-dma-engine", od);
-                if (rc)
+                if (rc) {
+                        omap_dma_free(od);
                         return rc;
+                }
         }
 
         if (omap_dma_glbl_read(od, CAPS_0) & CAPS_0_SUPPORT_LL123)
diff --git a/drivers/fpga/altera-ps-spi.c b/drivers/fpga/altera-ps-spi.c
index a13f224303c6..0221dee8dd4c 100644
--- a/drivers/fpga/altera-ps-spi.c
+++ b/drivers/fpga/altera-ps-spi.c
@@ -210,7 +210,7 @@ static int altera_ps_write_complete(struct fpga_manager *mgr,
                 return -EIO;
         }
 
-        if (!IS_ERR(conf->confd)) {
+        if (conf->confd) {
                 if (!gpiod_get_raw_value_cansleep(conf->confd)) {
                         dev_err(&mgr->dev, "CONF_DONE is inactive!\n");
                         return -EIO;
@@ -289,10 +289,13 @@ static int altera_ps_probe(struct spi_device *spi)
                 return PTR_ERR(conf->status);
         }
 
-        conf->confd = devm_gpiod_get(&spi->dev, "confd", GPIOD_IN);
+        conf->confd = devm_gpiod_get_optional(&spi->dev, "confd", GPIOD_IN);
         if (IS_ERR(conf->confd)) {
-                dev_warn(&spi->dev, "Not using confd gpio: %ld\n",
-                         PTR_ERR(conf->confd));
+                dev_err(&spi->dev, "Failed to get confd gpio: %ld\n",
+                        PTR_ERR(conf->confd));
+                return PTR_ERR(conf->confd);
+        } else if (!conf->confd) {
+                dev_warn(&spi->dev, "Not using confd gpio");
         }
 
         /* Register manager with unique name */
diff --git a/drivers/fsi/fsi-scom.c b/drivers/fsi/fsi-scom.c
index 343153d47e5b..004dc03ccf09 100644
--- a/drivers/fsi/fsi-scom.c
+++ b/drivers/fsi/fsi-scom.c
@@ -38,8 +38,7 @@
 #define SCOM_STATUS_PIB_RESP_MASK       0x00007000
 #define SCOM_STATUS_PIB_RESP_SHIFT      12
 
-#define SCOM_STATUS_ANY_ERR             (SCOM_STATUS_ERR_SUMMARY | \
-                                         SCOM_STATUS_PROTECTION | \
+#define SCOM_STATUS_ANY_ERR             (SCOM_STATUS_PROTECTION | \
                                          SCOM_STATUS_PARITY |     \
                                          SCOM_STATUS_PIB_ABORT | \
                                          SCOM_STATUS_PIB_RESP_MASK)
@@ -251,11 +250,6 @@ static int handle_fsi2pib_status(struct scom_device *scom, uint32_t status)
         /* Return -EBUSY on PIB abort to force a retry */
         if (status & SCOM_STATUS_PIB_ABORT)
                 return -EBUSY;
-        if (status & SCOM_STATUS_ERR_SUMMARY) {
-                fsi_device_write(scom->fsi_dev, SCOM_FSI2PIB_RESET_REG, &dummy,
-                                 sizeof(uint32_t));
-                return -EIO;
-        }
         return 0;
 }
 
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 378b206d2dc9..48fea4c68e8d 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -604,10 +604,9 @@ static void pca953x_irq_bus_sync_unlock(struct irq_data *d)
         u8 new_irqs;
         int level, i;
         u8 invert_irq_mask[MAX_BANK];
-        int reg_direction[MAX_BANK];
+        u8 reg_direction[MAX_BANK];
 
-        regmap_bulk_read(chip->regmap, chip->regs->direction, reg_direction,
-                         NBANK(chip));
+        pca953x_read_regs(chip, chip->regs->direction, reg_direction);
 
         if (chip->driver_data & PCA_PCAL) {
                 /* Enable latch on interrupt-enabled inputs */
@@ -679,7 +678,7 @@ static bool pca953x_irq_pending(struct pca953x_chip *chip, u8 *pending)
         bool pending_seen = false;
         bool trigger_seen = false;
         u8 trigger[MAX_BANK];
-        int reg_direction[MAX_BANK];
+        u8 reg_direction[MAX_BANK];
         int ret, i;
 
         if (chip->driver_data & PCA_PCAL) {
@@ -710,8 +709,7 @@ static bool pca953x_irq_pending(struct pca953x_chip *chip, u8 *pending)
                 return false;
 
         /* Remove output pins from the equation */
-        regmap_bulk_read(chip->regmap, chip->regs->direction, reg_direction,
-                         NBANK(chip));
+        pca953x_read_regs(chip, chip->regs->direction, reg_direction);
         for (i = 0; i < NBANK(chip); i++)
                 cur_stat[i] &= reg_direction[i];
 
@@ -768,7 +766,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
 {
         struct i2c_client *client = chip->client;
         struct irq_chip *irq_chip = &chip->irq_chip;
-        int reg_direction[MAX_BANK];
+        u8 reg_direction[MAX_BANK];
         int ret, i;
 
         if (!client->irq)
@@ -789,8 +787,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
          * interrupt.  We have to rely on the previous read for
          * this purpose.
          */
-        regmap_bulk_read(chip->regmap, chip->regs->direction, reg_direction,
-                         NBANK(chip));
+        pca953x_read_regs(chip, chip->regs->direction, reg_direction);
         for (i = 0; i < NBANK(chip); i++)
                 chip->irq_stat[i] &= reg_direction[i];
         mutex_init(&chip->irq_lock);
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 567fb98c0892..9762dd6d99fa 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -363,7 +363,7 @@ struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
         /* Special handling for SPI GPIOs if used */
         if (IS_ERR(desc))
                 desc = of_find_spi_gpio(dev, con_id, &of_flags);
-        if (IS_ERR(desc)) {
+        if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER) {
                 /* This quirk looks up flags and all */
                 desc = of_find_spi_cs_gpio(dev, con_id, idx, flags);
                 if (!IS_ERR(desc))
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index f497003f119c..cca749010cd0 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1091,9 +1091,11 @@ static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 if (test_bit(FLAG_ACTIVE_LOW, &desc->flags))
                         lineinfo.flags |= GPIOLINE_FLAG_ACTIVE_LOW;
                 if (test_bit(FLAG_OPEN_DRAIN, &desc->flags))
-                        lineinfo.flags |= GPIOLINE_FLAG_OPEN_DRAIN;
+                        lineinfo.flags |= (GPIOLINE_FLAG_OPEN_DRAIN |
+                                           GPIOLINE_FLAG_IS_OUT);
                 if (test_bit(FLAG_OPEN_SOURCE, &desc->flags))
-                        lineinfo.flags |= GPIOLINE_FLAG_OPEN_SOURCE;
+                        lineinfo.flags |= (GPIOLINE_FLAG_OPEN_SOURCE |
+                                           GPIOLINE_FLAG_IS_OUT);
 
                 if (copy_to_user(ip, &lineinfo, sizeof(lineinfo)))
                         return -EFAULT;
@@ -1371,21 +1373,13 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
         if (status)
                 goto err_remove_from_list;
 
-        status = gpiochip_irqchip_init_valid_mask(chip);
-        if (status)
-                goto err_remove_from_list;
-
         status = gpiochip_alloc_valid_mask(chip);
         if (status)
-                goto err_remove_irqchip_mask;
-
-        status = gpiochip_add_irqchip(chip, lock_key, request_key);
-        if (status)
-                goto err_free_gpiochip_mask;
+                goto err_remove_from_list;
 
         status = of_gpiochip_add(chip);
         if (status)
-                goto err_remove_chip;
+                goto err_free_gpiochip_mask;
 
         status = gpiochip_init_valid_mask(chip);
         if (status)
@@ -1411,6 +1405,14 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
 
         machine_gpiochip_add(chip);
 
+        status = gpiochip_irqchip_init_valid_mask(chip);
+        if (status)
+                goto err_remove_acpi_chip;
+
+        status = gpiochip_add_irqchip(chip, lock_key, request_key);
+        if (status)
+                goto err_remove_irqchip_mask;
+
         /*
          * By first adding the chardev, and then adding the device,
          * we get a device node entry in sysfs under
@@ -1422,21 +1424,21 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
         if (gpiolib_initialized) {
                 status = gpiochip_setup_dev(gdev);
                 if (status)
-                        goto err_remove_acpi_chip;
+                        goto err_remove_irqchip;
         }
         return 0;
 
+err_remove_irqchip:
+        gpiochip_irqchip_remove(chip);
+err_remove_irqchip_mask:
+        gpiochip_irqchip_free_valid_mask(chip);
 err_remove_acpi_chip:
         acpi_gpiochip_remove(chip);
 err_remove_of_chip:
         gpiochip_free_hogs(chip);
         of_gpiochip_remove(chip);
-err_remove_chip:
-        gpiochip_irqchip_remove(chip);
 err_free_gpiochip_mask:
         gpiochip_free_valid_mask(chip);
-err_remove_irqchip_mask:
-        gpiochip_irqchip_free_valid_mask(chip);
 err_remove_from_list:
         spin_lock_irqsave(&gpio_lock, flags);
         list_del(&gdev->list);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
index 9b384a94d2f3..3e35a8f2c5e5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
@@ -574,6 +574,7 @@ static const struct amdgpu_px_quirk amdgpu_px_quirk_list[] = {
         { 0x1002, 0x6900, 0x1002, 0x0124, AMDGPU_PX_QUIRK_FORCE_ATPX },
         { 0x1002, 0x6900, 0x1028, 0x0812, AMDGPU_PX_QUIRK_FORCE_ATPX },
         { 0x1002, 0x6900, 0x1028, 0x0813, AMDGPU_PX_QUIRK_FORCE_ATPX },
+        { 0x1002, 0x699f, 0x1028, 0x0814, AMDGPU_PX_QUIRK_FORCE_ATPX },
         { 0x1002, 0x6900, 0x1025, 0x125A, AMDGPU_PX_QUIRK_FORCE_ATPX },
         { 0x1002, 0x6900, 0x17AA, 0x3806, AMDGPU_PX_QUIRK_FORCE_ATPX },
         { 0, 0, 0, 0, 0 },
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 4e4094f842e7..8b26c970a3cb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1143,6 +1143,9 @@ static int amdgpu_cs_process_syncobj_out_dep(struct amdgpu_cs_parser *p,
         num_deps = chunk->length_dw * 4 /
                 sizeof(struct drm_amdgpu_cs_chunk_sem);
 
+        if (p->post_deps)
+                return -EINVAL;
+
         p->post_deps = kmalloc_array(num_deps, sizeof(*p->post_deps),
                                      GFP_KERNEL);
         p->num_post_deps = 0;
@@ -1166,8 +1169,7 @@ static int amdgpu_cs_process_syncobj_out_dep(struct amdgpu_cs_parser *p,
 
 
 static int amdgpu_cs_process_syncobj_timeline_out_dep(struct amdgpu_cs_parser *p,
-                                                      struct amdgpu_cs_chunk
-                                                      *chunk)
+                                                      struct amdgpu_cs_chunk *chunk)
 {
         struct drm_amdgpu_cs_chunk_syncobj *syncobj_deps;
         unsigned num_deps;
@@ -1177,6 +1179,9 @@ static int amdgpu_cs_process_syncobj_timeline_out_dep(struct amdgpu_cs_parser *p
         num_deps = chunk->length_dw * 4 /
                 sizeof(struct drm_amdgpu_cs_chunk_syncobj);
 
+        if (p->post_deps)
+                return -EINVAL;
+
         p->post_deps = kmalloc_array(num_deps, sizeof(*p->post_deps),
                                      GFP_KERNEL);
         p->num_post_deps = 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
index f539a2a92774..7398b4850649 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
@@ -534,21 +534,24 @@ int amdgpu_ctx_wait_prev_fence(struct amdgpu_ctx *ctx,
                                struct drm_sched_entity *entity)
 {
         struct amdgpu_ctx_entity *centity = to_amdgpu_ctx_entity(entity);
-        unsigned idx = centity->sequence & (amdgpu_sched_jobs - 1);
-        struct dma_fence *other = centity->fences[idx];
+        struct dma_fence *other;
+        unsigned idx;
+        long r;
 
-        if (other) {
-                signed long r;
-                r = dma_fence_wait(other, true);
-                if (r < 0) {
-                        if (r != -ERESTARTSYS)
-                                DRM_ERROR("Error (%ld) waiting for fence!\n", r);
+        spin_lock(&ctx->ring_lock);
+        idx = centity->sequence & (amdgpu_sched_jobs - 1);
+        other = dma_fence_get(centity->fences[idx]);
+        spin_unlock(&ctx->ring_lock);
 
-                        return r;
-                }
-        }
+        if (!other)
+                return 0;
 
-        return 0;
+        r = dma_fence_wait(other, true);
+        if (r < 0 && r != -ERESTARTSYS)
+                DRM_ERROR("Error (%ld) waiting for fence!\n", r);
+
+        dma_fence_put(other);
+        return r;
 }
 
 void amdgpu_ctx_mgr_init(struct amdgpu_ctx_mgr *mgr)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 04b8ac4432c7..c066e1d3f981 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -596,14 +596,18 @@ static void gfx_v9_0_check_if_need_gfxoff(struct amdgpu_device *adev)
         case CHIP_VEGA20:
                 break;
         case CHIP_RAVEN:
-                if (adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8)
-                        break;
-                if ((adev->gfx.rlc_fw_version != 106 &&
-                     adev->gfx.rlc_fw_version < 531) ||
-                    (adev->gfx.rlc_fw_version == 53815) ||
-                    (adev->gfx.rlc_feature_version < 1) ||
-                    !adev->gfx.rlc.is_rlc_v2_1)
+                if (!(adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8)
+                        &&((adev->gfx.rlc_fw_version != 106 &&
+                             adev->gfx.rlc_fw_version < 531) ||
+                            (adev->gfx.rlc_fw_version == 53815) ||
+                            (adev->gfx.rlc_feature_version < 1) ||
+                            !adev->gfx.rlc.is_rlc_v2_1))
                         adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
+
+                if (adev->pm.pp_feature & PP_GFXOFF_MASK)
+                        adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG |
+                                AMD_PG_SUPPORT_CP |
+                                AMD_PG_SUPPORT_RLC_SMU_HS;
                 break;
         default:
                 break;
diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index 662612f89c70..9922bce3fd89 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -552,7 +552,6 @@ static int nv_common_early_init(void *handle)
                         AMD_CG_SUPPORT_BIF_LS;
                 adev->pg_flags = AMD_PG_SUPPORT_VCN |
                         AMD_PG_SUPPORT_VCN_DPG |
-                        AMD_PG_SUPPORT_MMHUB |
                         AMD_PG_SUPPORT_ATHUB;
                 adev->external_rev_id = adev->rev_id + 0x1;
                 break;
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 23265414d448..04fbf05d7176 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -992,11 +992,6 @@ static int soc15_common_early_init(void *handle)
 
                         adev->pg_flags = AMD_PG_SUPPORT_SDMA | AMD_PG_SUPPORT_VCN;
                 }
-
-                if (adev->pm.pp_feature & PP_GFXOFF_MASK)
-                        adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG |
-                                AMD_PG_SUPPORT_CP |
-                                AMD_PG_SUPPORT_RLC_SMU_HS;
                 break;
         default:
                 /* FIXME: not supported yet */
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 4a29f72334d0..45be7a2132bb 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3131,13 +3131,25 @@ static enum dc_color_depth
 convert_color_depth_from_display_info(const struct drm_connector *connector,
                                       const struct drm_connector_state *state)
 {
-        uint32_t bpc = connector->display_info.bpc;
+        uint8_t bpc = (uint8_t)connector->display_info.bpc;
+
+        /* Assume 8 bpc by default if no bpc is specified. */
+        bpc = bpc ? bpc : 8;
 
         if (!state)
                 state = connector->state;
 
         if (state) {
-                bpc = state->max_bpc;
+                /*
+                 * Cap display bpc based on the user requested value.
+                 *
+                 * The value for state->max_bpc may not correctly updated
+                 * depending on when the connector gets added to the state
+                 * or if this was called outside of atomic check, so it
+                 * can't be used directly.
+                 */
+                bpc = min(bpc, state->max_requested_bpc);
+
                 /* Round down to the nearest even number. */
                 bpc = bpc - (bpc & 1);
         }
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c
index f27c6fbb192e..90c4e87ac5ad 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c
@@ -2101,7 +2101,11 @@ static int vega20_get_gpu_power(struct pp_hwmgr *hwmgr,
         if (ret)
                 return ret;
 
-        *query = metrics_table.CurrSocketPower << 8;
+        /* For the 40.46 release, they changed the value name */
+        if (hwmgr->smu_version == 0x282e00)
+                *query = metrics_table.AverageSocketPower << 8;
+        else
+                *query = metrics_table.CurrSocketPower << 8;
 
         return ret;
 }
@@ -2349,12 +2353,16 @@ static int vega20_force_dpm_highest(struct pp_hwmgr *hwmgr)
                 data->dpm_table.soc_table.dpm_state.soft_max_level =
                 data->dpm_table.soc_table.dpm_levels[soft_level].value;
 
-        ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);
+        ret = vega20_upload_dpm_min_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |
+                                                 FEATURE_DPM_UCLK_MASK |
+                                                 FEATURE_DPM_SOCCLK_MASK);
         PP_ASSERT_WITH_CODE(!ret,
                         "Failed to upload boot level to highest!",
                         return ret);
 
-        ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);
+        ret = vega20_upload_dpm_max_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |
+                                                 FEATURE_DPM_UCLK_MASK |
+                                                 FEATURE_DPM_SOCCLK_MASK);
         PP_ASSERT_WITH_CODE(!ret,
                         "Failed to upload dpm max level to highest!",
                         return ret);
@@ -2387,12 +2395,16 @@ static int vega20_force_dpm_lowest(struct pp_hwmgr *hwmgr)
                 data->dpm_table.soc_table.dpm_state.soft_max_level =
                 data->dpm_table.soc_table.dpm_levels[soft_level].value;
 
-        ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);
+        ret = vega20_upload_dpm_min_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |
+                                                 FEATURE_DPM_UCLK_MASK |
+                                                 FEATURE_DPM_SOCCLK_MASK);
         PP_ASSERT_WITH_CODE(!ret,
                         "Failed to upload boot level to highest!",
                         return ret);
 
-        ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);
+        ret = vega20_upload_dpm_max_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |
+                                                 FEATURE_DPM_UCLK_MASK |
+                                                 FEATURE_DPM_SOCCLK_MASK);
         PP_ASSERT_WITH_CODE(!ret,
                         "Failed to upload dpm max level to highest!",
                         return ret);
@@ -2403,14 +2415,54 @@ static int vega20_force_dpm_lowest(struct pp_hwmgr *hwmgr)
 
 static int vega20_unforce_dpm_levels(struct pp_hwmgr *hwmgr)
 {
+        struct vega20_hwmgr *data =
+                        (struct vega20_hwmgr *)(hwmgr->backend);
+        uint32_t soft_min_level, soft_max_level;
         int ret = 0;
 
-        ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);
+        /* gfxclk soft min/max settings */
+        soft_min_level =
+                vega20_find_lowest_dpm_level(&(data->dpm_table.gfx_table));
+        soft_max_level =
+                vega20_find_highest_dpm_level(&(data->dpm_table.gfx_table));
+
+        data->dpm_table.gfx_table.dpm_state.soft_min_level =
+                data->dpm_table.gfx_table.dpm_levels[soft_min_level].value;
+        data->dpm_table.gfx_table.dpm_state.soft_max_level =
+                data->dpm_table.gfx_table.dpm_levels[soft_max_level].value;
+
+        /* uclk soft min/max settings */
+        soft_min_level =
+                vega20_find_lowest_dpm_level(&(data->dpm_table.mem_table));
+        soft_max_level =
+                vega20_find_highest_dpm_level(&(data->dpm_table.mem_table));
+
+        data->dpm_table.mem_table.dpm_state.soft_min_level =
+                data->dpm_table.mem_table.dpm_levels[soft_min_level].value;
+        data->dpm_table.mem_table.dpm_state.soft_max_level =
+                data->dpm_table.mem_table.dpm_levels[soft_max_level].value;
+
+        /* socclk soft min/max settings */
+        soft_min_level =
+                vega20_find_lowest_dpm_level(&(data->dpm_table.soc_table));
+        soft_max_level =
+                vega20_find_highest_dpm_level(&(data->dpm_table.soc_table));
+
+        data->dpm_table.soc_table.dpm_state.soft_min_level =
+                data->dpm_table.soc_table.dpm_levels[soft_min_level].value;
+        data->dpm_table.soc_table.dpm_state.soft_max_level =
+                data->dpm_table.soc_table.dpm_levels[soft_max_level].value;
+
+        ret = vega20_upload_dpm_min_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |
+                                                 FEATURE_DPM_UCLK_MASK |
+                                                 FEATURE_DPM_SOCCLK_MASK);
         PP_ASSERT_WITH_CODE(!ret,
                         "Failed to upload DPM Bootup Levels!",
                         return ret);
 
-        ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);
+        ret = vega20_upload_dpm_max_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |
+                                                 FEATURE_DPM_UCLK_MASK |
+                                                 FEATURE_DPM_SOCCLK_MASK);
         PP_ASSERT_WITH_CODE(!ret,
                         "Failed to upload DPM Max Levels!",
                         return ret);
diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
index a0f52c86d8c7..a78b2e295895 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
@@ -907,8 +907,6 @@ struct smu_funcs
         ((smu)->funcs->register_irq_handler ? (smu)->funcs->register_irq_handler(smu) : 0)
 #define smu_set_azalia_d3_pme(smu) \
         ((smu)->funcs->set_azalia_d3_pme ? (smu)->funcs->set_azalia_d3_pme((smu)) : 0)
-#define smu_get_uclk_dpm_states(smu, clocks_in_khz, num_states) \
-        ((smu)->ppt_funcs->get_uclk_dpm_states ? (smu)->ppt_funcs->get_uclk_dpm_states((smu), (clocks_in_khz), (num_states)) : 0)
 #define smu_get_max_sustainable_clocks_by_dc(smu, max_clocks) \
         ((smu)->funcs->get_max_sustainable_clocks_by_dc ? (smu)->funcs->get_max_sustainable_clocks_by_dc((smu), (max_clocks)) : 0)
 #define smu_get_uclk_dpm_states(smu, clocks_in_khz, num_states) \
diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
index 5fde5cf65b42..53097961bf2b 100644
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
@@ -326,7 +326,8 @@ static int smu_v11_0_setup_pptable(struct smu_context *smu)
         struct amdgpu_device *adev = smu->adev;
         const struct smc_firmware_header_v1_0 *hdr;
         int ret, index;
-        uint32_t size;
+        uint32_t size = 0;
+        uint16_t atom_table_size;
         uint8_t frev, crev;
         void *table;
         uint16_t version_major, version_minor;
@@ -354,10 +355,11 @@ static int smu_v11_0_setup_pptable(struct smu_context *smu)
                 index = get_index_into_master_table(atom_master_list_of_data_tables_v2_1,
                                                     powerplayinfo);
 
-                ret = smu_get_atom_data_table(smu, index, (uint16_t *)&size, &frev, &crev,
+                ret = smu_get_atom_data_table(smu, index, &atom_table_size, &frev, &crev,
                                               (uint8_t **)&table);
                 if (ret)
                         return ret;
+                size = atom_table_size;
         }
 
         if (!smu->smu_table.power_play_table)
diff --git a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
index dd6fd1c8bf24..6a14497257e4 100644
--- a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
@@ -3050,6 +3050,7 @@ static int vega20_get_fan_speed_percent(struct smu_context *smu,
 
 static int vega20_get_gpu_power(struct smu_context *smu, uint32_t *value)
 {
+        uint32_t smu_version;
         int ret = 0;
         SmuMetrics_t metrics;
 
@@ -3060,7 +3061,15 @@ static int vega20_get_gpu_power(struct smu_context *smu, uint32_t *value)
         if (ret)
                 return ret;
 
-        *value = metrics.CurrSocketPower << 8;
+        ret = smu_get_smc_version(smu, NULL, &smu_version);
+        if (ret)
+                return ret;
+
+        /* For the 40.46 release, they changed the value name */
+        if (smu_version == 0x282e00)
+                *value = metrics.AverageSocketPower << 8;
+        else
+                *value = metrics.CurrSocketPower << 8;
 
         return 0;
 }
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
index 5a118984de33..9d4d5075cc64 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
@@ -8,6 +8,7 @@
 #include <linux/iommu.h>
 #include <linux/of_device.h>
 #include <linux/of_graph.h>
+#include <linux/of_reserved_mem.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #ifdef CONFIG_DEBUG_FS
@@ -126,7 +127,7 @@ static int komeda_parse_pipe_dt(struct komeda_dev *mdev, struct device_node *np)
         pipe->of_output_port =
                 of_graph_get_port_by_id(np, KOMEDA_OF_PORT_OUTPUT);
 
-        pipe->of_node = np;
+        pipe->of_node = of_node_get(np);
 
         return 0;
 }
@@ -143,6 +144,12 @@ static int komeda_parse_dt(struct device *dev, struct komeda_dev *mdev)
                 return mdev->irq;
         }
 
+        /* Get the optional framebuffer memory resource */
+        ret = of_reserved_mem_device_init(dev);
+        if (ret && ret != -ENODEV)
+                return ret;
+        ret = 0;
+
         for_each_available_child_of_node(np, child) {
                 if (of_node_cmp(child->name, "pipeline") == 0) {
                         ret = komeda_parse_pipe_dt(mdev, child);
@@ -289,6 +296,8 @@ void komeda_dev_destroy(struct komeda_dev *mdev)
 
         mdev->n_pipelines = 0;
 
+        of_reserved_mem_device_release(dev);
+
         if (funcs && funcs->cleanup)
                 funcs->cleanup(mdev);
 
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c b/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c
index cd4d9f53ddef..c9a1edb9a000 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c
@@ -35,6 +35,25 @@ komeda_get_format_caps(struct komeda_format_caps_table *table,
         return NULL;
 }
 
+u32 komeda_get_afbc_format_bpp(const struct drm_format_info *info, u64 modifier)
+{
+        u32 bpp;
+
+        switch (info->format) {
+        case DRM_FORMAT_YUV420_8BIT:
+                bpp = 12;
+                break;
+        case DRM_FORMAT_YUV420_10BIT:
+                bpp = 15;
+                break;
+        default:
+                bpp = info->cpp[0] * 8;
+                break;
+        }
+
+        return bpp;
+}
+
 /* Two assumptions
  * 1. RGB always has YTR
  * 2. Tiled RGB always has SC
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h b/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h
index 3631910d33b5..32273cf18f7c 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h
@@ -97,6 +97,9 @@ const struct komeda_format_caps *
 komeda_get_format_caps(struct komeda_format_caps_table *table,
                        u32 fourcc, u64 modifier);
 
+u32 komeda_get_afbc_format_bpp(const struct drm_format_info *info,
+                               u64 modifier);
+
 u32 *komeda_get_layer_fourcc_list(struct komeda_format_caps_table *table,
                                   u32 layer_type, u32 *n_fmts);
 
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
index 3b0a70ed6aa0..1b01a625f40e 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
@@ -43,7 +43,7 @@ komeda_fb_afbc_size_check(struct komeda_fb *kfb, struct drm_file *file,
         struct drm_framebuffer *fb = &kfb->base;
         const struct drm_format_info *info = fb->format;
         struct drm_gem_object *obj;
-        u32 alignment_w = 0, alignment_h = 0, alignment_header, n_blocks;
+        u32 alignment_w = 0, alignment_h = 0, alignment_header, n_blocks, bpp;
         u64 min_size;
 
         obj = drm_gem_object_lookup(file, mode_cmd->handles[0]);
@@ -88,8 +88,9 @@ komeda_fb_afbc_size_check(struct komeda_fb *kfb, struct drm_file *file,
         kfb->offset_payload = ALIGN(n_blocks * AFBC_HEADER_SIZE,
                                     alignment_header);
 
+        bpp = komeda_get_afbc_format_bpp(info, fb->modifier);
         kfb->afbc_size = kfb->offset_payload + n_blocks *
-                         ALIGN(info->cpp[0] * AFBC_SUPERBLK_PIXELS,
+                         ALIGN(bpp * AFBC_SUPERBLK_PIXELS / 8,
                                AFBC_SUPERBLK_ALIGNMENT);
         min_size = kfb->afbc_size + fb->offsets[0];
         if (min_size > obj->size) {
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
index 419a8b0e5de8..69d9e26c60c8 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
@@ -14,6 +14,7 @@
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_irq.h>
+#include <drm/drm_probe_helper.h>
 #include <drm/drm_vblank.h>
 
 #include "komeda_dev.h"
@@ -146,7 +147,6 @@ static int komeda_crtc_normalize_zpos(struct drm_crtc *crtc,
         struct komeda_crtc_state *kcrtc_st = to_kcrtc_st(crtc_st);
         struct komeda_plane_state *kplane_st;
         struct drm_plane_state *plane_st;
-        struct drm_framebuffer *fb;
         struct drm_plane *plane;
         struct list_head zorder_list;
         int order = 0, err;
@@ -172,7 +172,6 @@ static int komeda_crtc_normalize_zpos(struct drm_crtc *crtc,
 
         list_for_each_entry(kplane_st, &zorder_list, zlist_node) {
                 plane_st = &kplane_st->base;
-                fb = plane_st->fb;
                 plane = plane_st->plane;
 
                 plane_st->normalized_zpos = order++;
@@ -205,7 +204,7 @@ static int komeda_kms_check(struct drm_device *dev,
                             struct drm_atomic_state *state)
 {
         struct drm_crtc *crtc;
-        struct drm_crtc_state *old_crtc_st, *new_crtc_st;
+        struct drm_crtc_state *new_crtc_st;
         int i, err;
 
         err = drm_atomic_helper_check_modeset(dev, state);
@@ -216,7 +215,7 @@ static int komeda_kms_check(struct drm_device *dev,
          * so need to add all affected_planes (even unchanged) to
          * drm_atomic_state.
          */
-        for_each_oldnew_crtc_in_state(state, crtc, old_crtc_st, new_crtc_st, i) {
+        for_each_new_crtc_in_state(state, crtc, new_crtc_st, i) {
                 err = drm_atomic_add_affected_planes(state, crtc);
                 if (err)
                         return err;
@@ -307,24 +306,33 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev)
                                komeda_kms_irq_handler, IRQF_SHARED,
                                drm->driver->name, drm);
         if (err)
-                goto cleanup_mode_config;
+                goto free_component_binding;
 
         err = mdev->funcs->enable_irq(mdev);
         if (err)
-                goto cleanup_mode_config;
+                goto free_component_binding;
 
         drm->irq_enabled = true;
 
+        drm_kms_helper_poll_init(drm);
+
         err = drm_dev_register(drm, 0);
         if (err)
-                goto cleanup_mode_config;
+                goto free_interrupts;
 
         return kms;
 
-cleanup_mode_config:
+free_interrupts:
+        drm_kms_helper_poll_fini(drm);
         drm->irq_enabled = false;
+        mdev->funcs->disable_irq(mdev);
+free_component_binding:
+        component_unbind_all(mdev->dev, drm);
+cleanup_mode_config:
         drm_mode_config_cleanup(drm);
         komeda_kms_cleanup_private_objs(kms);
+        drm->dev_private = NULL;
+        drm_dev_put(drm);
 free_kms:
         kfree(kms);
         return ERR_PTR(err);
@@ -335,12 +343,14 @@ void komeda_kms_detach(struct komeda_kms_dev *kms)
         struct drm_device *drm = &kms->base;
         struct komeda_dev *mdev = drm->dev_private;
 
+        drm_dev_unregister(drm);
+        drm_kms_helper_poll_fini(drm);
+        drm_atomic_helper_shutdown(drm);
         drm->irq_enabled = false;
         mdev->funcs->disable_irq(mdev);
-        drm_dev_unregister(drm);
         component_unbind_all(mdev->dev, drm);
-        komeda_kms_cleanup_private_objs(kms);
         drm_mode_config_cleanup(drm);
+        komeda_kms_cleanup_private_objs(kms);
         drm->dev_private = NULL;
         drm_dev_put(drm);
 }
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
index a90bcbb3cb23..14b683164544 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
@@ -480,6 +480,7 @@ void komeda_pipeline_dump_register(struct komeda_pipeline *pipe,
                                    struct seq_file *sf);
 
 /* component APIs */
+extern __printf(10, 11)
 struct komeda_component *
 komeda_component_add(struct komeda_pipeline *pipe,
                      size_t comp_sz, u32 id, u32 hw_id,
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
index 617e1f7b8472..2851cac94d86 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
@@ -148,7 +148,7 @@ static int komeda_wb_connector_add(struct komeda_kms_dev *kms,
         if (!kcrtc->master->wb_layer)
                 return 0;
 
-        kwb_conn = kzalloc(sizeof(*wb_conn), GFP_KERNEL);
+        kwb_conn = kzalloc(sizeof(*kwb_conn), GFP_KERNEL);
         if (!kwb_conn)
                 return -ENOMEM;
 
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index b0369e690f36..0d23bf729e9f 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -1454,6 +1454,7 @@ static int drm_mode_parse_cmdline_refresh(const char *str, char **end_ptr,
 }
 
 static int drm_mode_parse_cmdline_extra(const char *str, int length,
+                                        bool freestanding,
                                         const struct drm_connector *connector,
                                         struct drm_cmdline_mode *mode)
 {
@@ -1462,9 +1463,15 @@ static int drm_mode_parse_cmdline_extra(const char *str, int length,
         for (i = 0; i < length; i++) {
                 switch (str[i]) {
                 case 'i':
+                        if (freestanding)
+                                return -EINVAL;
+
                         mode->interlace = true;
                         break;
                 case 'm':
+                        if (freestanding)
+                                return -EINVAL;
+
                         mode->margins = true;
                         break;
                 case 'D':
@@ -1542,6 +1549,7 @@ static int drm_mode_parse_cmdline_res_mode(const char *str, unsigned int length,
                         if (extras) {
                                 int ret = drm_mode_parse_cmdline_extra(end_ptr + i,
                                                                        1,
+                                                                       false,
                                                                        connector,
                                                                        mode);
                                 if (ret)
@@ -1669,6 +1677,22 @@ static int drm_mode_parse_cmdline_options(char *str, size_t len,
         return 0;
 }
 
+static const char *drm_named_modes_whitelist[] = {
+        "NTSC",
+        "PAL",
+};
+
+static bool drm_named_mode_is_in_whitelist(const char *mode, unsigned int size)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(drm_named_modes_whitelist); i++)
+                if (!strncmp(mode, drm_named_modes_whitelist[i], size))
+                        return true;
+
+        return false;
+}
+
 /**
  * drm_mode_parse_command_line_for_connector - parse command line modeline for connector
  * @mode_option: optional per connector mode option
@@ -1725,16 +1749,30 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
          * bunch of things:
          *   - We need to make sure that the first character (which
          *     would be our resolution in X) is a digit.
-         *   - However, if the X resolution is missing, then we end up
-         *     with something like x<yres>, with our first character
-         *     being an alpha-numerical character, which would be
-         *     considered a named mode.
+         *   - If not, then it's either a named mode or a force on/off.
+         *     To distinguish between the two, we need to run the
+         *     extra parsing function, and if not, then we consider it
+         *     a named mode.
          *
          * If this isn't enough, we should add more heuristics here,
          * and matching unit-tests.
          */
-        if (!isdigit(name[0]) && name[0] != 'x')
+        if (!isdigit(name[0]) && name[0] != 'x') {
+                unsigned int namelen = strlen(name);
+
+                /*
+                 * Only the force on/off options can be in that case,
+                 * and they all take a single character.
+                 */
+                if (namelen == 1) {
+                        ret = drm_mode_parse_cmdline_extra(name, namelen, true,
+                                                           connector, mode);
+                        if (!ret)
+                                return true;
+                }
+
                 named_mode = true;
+        }
 
         /* Try to locate the bpp and refresh specifiers, if any */
         bpp_ptr = strchr(name, '-');
@@ -1772,6 +1810,10 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
         if (named_mode) {
                 if (mode_end + 1 > DRM_DISPLAY_MODE_LEN)
                         return false;
+
+                if (!drm_named_mode_is_in_whitelist(name, mode_end))
+                        return false;
+
                 strscpy(mode->name, name, mode_end + 1);
         } else {
                 ret = drm_mode_parse_cmdline_res_mode(name, mode_end,
@@ -1811,7 +1853,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
             extra_ptr != options_ptr) {
                 int len = strlen(name) - (extra_ptr - name);
 
-                ret = drm_mode_parse_cmdline_extra(extra_ptr, len,
+                ret = drm_mode_parse_cmdline_extra(extra_ptr, len, false,
                                                    connector, mode);
                 if (ret)
                         return false;
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 7925a176f900..1cb1fa74cfbc 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -1465,8 +1465,8 @@ static void ddi_dotclock_get(struct intel_crtc_state *pipe_config)
         else if (intel_crtc_has_dp_encoder(pipe_config))
                 dotclock = intel_dotclock_calculate(pipe_config->port_clock,
                                                     &pipe_config->dp_m_n);
-        else if (pipe_config->has_hdmi_sink && pipe_config->pipe_bpp == 36)
-                dotclock = pipe_config->port_clock * 2 / 3;
+        else if (pipe_config->has_hdmi_sink && pipe_config->pipe_bpp > 24)
+                dotclock = pipe_config->port_clock * 24 / pipe_config->pipe_bpp;
         else
                 dotclock = pipe_config->port_clock;
 
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 60652ebbdf61..18e4cba76720 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -539,7 +539,15 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
 
         intel_attach_force_audio_property(connector);
         intel_attach_broadcast_rgb_property(connector);
-        drm_connector_attach_max_bpc_property(connector, 6, 12);
+
+        /*
+         * Reuse the prop from the SST connector because we're
+         * not allowed to create new props after device registration.
+         */
+        connector->max_bpc_property =
+                intel_dp->attached_connector->base.max_bpc_property;
+        if (connector->max_bpc_property)
+                drm_connector_attach_max_bpc_property(connector, 6, 12);
 
         return connector;
 
diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c
index ffec807b8960..f413904a3e96 100644
--- a/drivers/gpu/drm/i915/display/intel_vdsc.c
+++ b/drivers/gpu/drm/i915/display/intel_vdsc.c
@@ -541,7 +541,7 @@ static void intel_configure_pps_for_dsc_encoder(struct intel_encoder *encoder,
         pps_val |= DSC_PIC_HEIGHT(vdsc_cfg->pic_height) |
                 DSC_PIC_WIDTH(vdsc_cfg->pic_width / num_vdsc_instances);
         DRM_INFO("PPS2 = 0x%08x\n", pps_val);
-        if (encoder->type == INTEL_OUTPUT_EDP) {
+        if (cpu_transcoder == TRANSCODER_EDP) {
                 I915_WRITE(DSCA_PICTURE_PARAMETER_SET_2, pps_val);
                 /*
                  * If 2 VDSC instances are needed, configure PPS for second
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f62e3397d936..bac1ee94f63f 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1598,6 +1598,12 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
 
         pci_set_master(pdev);
 
+        /*
+         * We don't have a max segment size, so set it to the max so sg's
+         * debugging layer doesn't complain
+         */
+        dma_set_max_seg_size(&pdev->dev, UINT_MAX);
+
         /* overlay on gen2 is broken and can't address above 1G */
         if (IS_GEN(dev_priv, 2)) {
                 ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(30));
diff --git a/drivers/gpu/drm/i915/i915_vgpu.c b/drivers/gpu/drm/i915/i915_vgpu.c
index 94d3992b599d..724627afdedc 100644
--- a/drivers/gpu/drm/i915/i915_vgpu.c
+++ b/drivers/gpu/drm/i915/i915_vgpu.c
@@ -101,6 +101,9 @@ static struct _balloon_info_ bl_info;
 static void vgt_deballoon_space(struct i915_ggtt *ggtt,
                                 struct drm_mm_node *node)
 {
+        if (!drm_mm_node_allocated(node))
+                return;
+
         DRM_DEBUG_DRIVER("deballoon space: range [0x%llx - 0x%llx] %llu KiB.\n",
                          node->start,
                          node->start + node->size,
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 1d58f7ec5d84..f11979879e7b 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -829,7 +829,7 @@ struct intel_crtc_state {
 
         /*
          * Frequence the dpll for the port should run at. Differs from the
-         * adjusted dotclock e.g. for DP or 12bpc hdmi mode. This is also
+         * adjusted dotclock e.g. for DP or 10/12bpc hdmi mode. This is also
          * already multiplied by pixel_multiplier.
          */
         int port_clock;
diff --git a/drivers/gpu/drm/ingenic/ingenic-drm.c b/drivers/gpu/drm/ingenic/ingenic-drm.c
index e9f9e9fb9b17..6381652a8829 100644
--- a/drivers/gpu/drm/ingenic/ingenic-drm.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm.c
@@ -656,10 +656,9 @@ static int ingenic_drm_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        if (panel) {
+        if (panel)
                 bridge = devm_drm_panel_bridge_add(dev, panel,
-                                                   DRM_MODE_CONNECTOR_Unknown);
-        }
+                                                   DRM_MODE_CONNECTOR_DPI);
 
         priv->dma_hwdesc = dma_alloc_coherent(dev, sizeof(*priv->dma_hwdesc),
                                               &priv->dma_hwdesc_phys,
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 95fdbd0fbcac..945bc20f1d33 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -17,6 +17,7 @@
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/pm_runtime.h>
+#include <linux/dma-mapping.h>
 
 #include "mtk_drm_crtc.h"
 #include "mtk_drm_ddp.h"
@@ -213,6 +214,7 @@ static int mtk_drm_kms_init(struct drm_device *drm)
         struct mtk_drm_private *private = drm->dev_private;
         struct platform_device *pdev;
         struct device_node *np;
+        struct device *dma_dev;
         int ret;
 
         if (!iommu_present(&platform_bus_type))
@@ -275,7 +277,29 @@ static int mtk_drm_kms_init(struct drm_device *drm)
                 goto err_component_unbind;
         }
 
-        private->dma_dev = &pdev->dev;
+        dma_dev = &pdev->dev;
+        private->dma_dev = dma_dev;
+
+        /*
+         * Configure the DMA segment size to make sure we get contiguous IOVA
+         * when importing PRIME buffers.
+         */
+        if (!dma_dev->dma_parms) {
+                private->dma_parms_allocated = true;
+                dma_dev->dma_parms =
+                        devm_kzalloc(drm->dev, sizeof(*dma_dev->dma_parms),
+                                     GFP_KERNEL);
+        }
+        if (!dma_dev->dma_parms) {
+                ret = -ENOMEM;
+                goto err_component_unbind;
+        }
+
+        ret = dma_set_max_seg_size(dma_dev, (unsigned int)DMA_BIT_MASK(32));
+        if (ret) {
+                dev_err(dma_dev, "Failed to set DMA segment size\n");
+                goto err_unset_dma_parms;
+        }
 
         /*
          * We don't use the drm_irq_install() helpers provided by the DRM
@@ -285,13 +309,16 @@ static int mtk_drm_kms_init(struct drm_device *drm)
         drm->irq_enabled = true;
         ret = drm_vblank_init(drm, MAX_CRTC);
         if (ret < 0)
-                goto err_component_unbind;
+                goto err_unset_dma_parms;
 
         drm_kms_helper_poll_init(drm);
         drm_mode_config_reset(drm);
 
         return 0;
 
+err_unset_dma_parms:
+        if (private->dma_parms_allocated)
+                dma_dev->dma_parms = NULL;
 err_component_unbind:
         component_unbind_all(drm->dev, drm);
 err_config_cleanup:
@@ -302,9 +329,14 @@ err_config_cleanup:
 
 static void mtk_drm_kms_deinit(struct drm_device *drm)
 {
+        struct mtk_drm_private *private = drm->dev_private;
+
         drm_kms_helper_poll_fini(drm);
         drm_atomic_helper_shutdown(drm);
 
+        if (private->dma_parms_allocated)
+                private->dma_dev->dma_parms = NULL;
+
         component_unbind_all(drm->dev, drm);
         drm_mode_config_cleanup(drm);
 }
@@ -320,6 +352,18 @@ static const struct file_operations mtk_drm_fops = {
         .compat_ioctl = drm_compat_ioctl,
 };
 
+/*
+ * We need to override this because the device used to import the memory is
+ * not dev->dev, as drm_gem_prime_import() expects.
+ */
+struct drm_gem_object *mtk_drm_gem_prime_import(struct drm_device *dev,
+                                                struct dma_buf *dma_buf)
+{
+        struct mtk_drm_private *private = dev->dev_private;
+
+        return drm_gem_prime_import_dev(dev, dma_buf, private->dma_dev);
+}
+
 static struct drm_driver mtk_drm_driver = {
         .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME |
                            DRIVER_ATOMIC,
@@ -331,7 +375,7 @@ static struct drm_driver mtk_drm_driver = {
         .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
         .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
         .gem_prime_export = drm_gem_prime_export,
-        .gem_prime_import = drm_gem_prime_import,
+        .gem_prime_import = mtk_drm_gem_prime_import,
         .gem_prime_get_sg_table = mtk_gem_prime_get_sg_table,
         .gem_prime_import_sg_table = mtk_gem_prime_import_sg_table,
         .gem_prime_mmap = mtk_drm_gem_mmap_buf,
@@ -524,12 +568,15 @@ static int mtk_drm_probe(struct platform_device *pdev)
                         comp = devm_kzalloc(dev, sizeof(*comp), GFP_KERNEL);
                         if (!comp) {
                                 ret = -ENOMEM;
+                                of_node_put(node);
                                 goto err_node;
                         }
 
                         ret = mtk_ddp_comp_init(dev, node, comp, comp_id, NULL);
-                        if (ret)
+                        if (ret) {
+                                of_node_put(node);
                                 goto err_node;
+                        }
 
                         private->ddp_comp[comp_id] = comp;
                 }
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
index 598ff3e70446..e03fea12ff59 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
@@ -51,6 +51,8 @@ struct mtk_drm_private {
         } commit;
 
         struct drm_atomic_state *suspend_state;
+
+        bool dma_parms_allocated;
 };
 
 extern struct platform_driver mtk_ddp_driver;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c
index b4e7404fe660..a11637b0f6cc 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c
@@ -40,8 +40,7 @@ nvkm_i2c_aux_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
                 u8 *ptr = msg->buf;
 
                 while (remaining) {
-                        u8 cnt = (remaining > 16) ? 16 : remaining;
-                        u8 cmd;
+                        u8 cnt, retries, cmd;
 
                         if (msg->flags & I2C_M_RD)
                                 cmd = 1;
@@ -51,10 +50,19 @@ nvkm_i2c_aux_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
                         if (mcnt || remaining > 16)
                                 cmd |= 4; /* MOT */
 
-                        ret = aux->func->xfer(aux, true, cmd, msg->addr, ptr, &cnt);
-                        if (ret < 0) {
-                                nvkm_i2c_aux_release(aux);
-                                return ret;
+                        for (retries = 0, cnt = 0;
+                             retries < 32 && !cnt;
+                             retries++) {
+                                cnt = min_t(u8, remaining, 16);
+                                ret = aux->func->xfer(aux, true, cmd,
+                                                      msg->addr, ptr, &cnt);
+                                if (ret < 0)
+                                        goto out;
+                        }
+                        if (!cnt) {
+                                AUX_TRACE(aux, "no data after 32 retries");
+                                ret = -EIO;
+                                goto out;
                         }
 
                         ptr += cnt;
@@ -64,8 +72,10 @@ nvkm_i2c_aux_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
                 msg++;
         }
 
+        ret = num;
+out:
         nvkm_i2c_aux_release(aux);
-        return num;
+        return ret;
 }
 
 static u32
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c
index 84a2f243ed9b..4695f1c8e33f 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c
@@ -190,6 +190,9 @@ MODULE_FIRMWARE("nvidia/gp102/nvdec/scrubber.bin");
 MODULE_FIRMWARE("nvidia/gp102/sec2/desc.bin");
 MODULE_FIRMWARE("nvidia/gp102/sec2/image.bin");
 MODULE_FIRMWARE("nvidia/gp102/sec2/sig.bin");
+MODULE_FIRMWARE("nvidia/gp102/sec2/desc-1.bin");
+MODULE_FIRMWARE("nvidia/gp102/sec2/image-1.bin");
+MODULE_FIRMWARE("nvidia/gp102/sec2/sig-1.bin");
 MODULE_FIRMWARE("nvidia/gp104/acr/bl.bin");
 MODULE_FIRMWARE("nvidia/gp104/acr/unload_bl.bin");
 MODULE_FIRMWARE("nvidia/gp104/acr/ucode_load.bin");
@@ -210,6 +213,9 @@ MODULE_FIRMWARE("nvidia/gp104/nvdec/scrubber.bin");
 MODULE_FIRMWARE("nvidia/gp104/sec2/desc.bin");
 MODULE_FIRMWARE("nvidia/gp104/sec2/image.bin");
 MODULE_FIRMWARE("nvidia/gp104/sec2/sig.bin");
+MODULE_FIRMWARE("nvidia/gp104/sec2/desc-1.bin");
+MODULE_FIRMWARE("nvidia/gp104/sec2/image-1.bin");
+MODULE_FIRMWARE("nvidia/gp104/sec2/sig-1.bin");
 MODULE_FIRMWARE("nvidia/gp106/acr/bl.bin");
 MODULE_FIRMWARE("nvidia/gp106/acr/unload_bl.bin");
 MODULE_FIRMWARE("nvidia/gp106/acr/ucode_load.bin");
@@ -230,6 +236,9 @@ MODULE_FIRMWARE("nvidia/gp106/nvdec/scrubber.bin");
 MODULE_FIRMWARE("nvidia/gp106/sec2/desc.bin");
 MODULE_FIRMWARE("nvidia/gp106/sec2/image.bin");
 MODULE_FIRMWARE("nvidia/gp106/sec2/sig.bin");
+MODULE_FIRMWARE("nvidia/gp106/sec2/desc-1.bin");
+MODULE_FIRMWARE("nvidia/gp106/sec2/image-1.bin");
+MODULE_FIRMWARE("nvidia/gp106/sec2/sig-1.bin");
 MODULE_FIRMWARE("nvidia/gp107/acr/bl.bin");
 MODULE_FIRMWARE("nvidia/gp107/acr/unload_bl.bin");
 MODULE_FIRMWARE("nvidia/gp107/acr/ucode_load.bin");
@@ -250,3 +259,6 @@ MODULE_FIRMWARE("nvidia/gp107/nvdec/scrubber.bin");
 MODULE_FIRMWARE("nvidia/gp107/sec2/desc.bin");
 MODULE_FIRMWARE("nvidia/gp107/sec2/image.bin");
 MODULE_FIRMWARE("nvidia/gp107/sec2/sig.bin");
+MODULE_FIRMWARE("nvidia/gp107/sec2/desc-1.bin");
+MODULE_FIRMWARE("nvidia/gp107/sec2/image-1.bin");
+MODULE_FIRMWARE("nvidia/gp107/sec2/sig-1.bin");
diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index de0f882f0f7b..14b41de44ebc 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -4,6 +4,7 @@
  * Author: Archit Taneja <archit@ti.com>
  */
 
+#include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -20,7 +21,8 @@ int omapdss_device_init_output(struct omap_dss_device *out)
 {
         struct device_node *remote_node;
 
-        remote_node = of_graph_get_remote_node(out->dev->of_node, 0, 0);
+        remote_node = of_graph_get_remote_node(out->dev->of_node,
+                                               ffs(out->of_ports) - 1, 0);
         if (!remote_node) {
                 dev_dbg(out->dev, "failed to find video sink\n");
                 return 0;
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 288c59dae56a..1bad0a2cc5c6 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -669,7 +669,7 @@ static int pdev_probe(struct platform_device *pdev)
         if (omapdss_is_initialized() == false)
                 return -EPROBE_DEFER;
 
-        ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+        ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
         if (ret) {
                 dev_err(&pdev->dev, "Failed to set the DMA mask\n");
                 return ret;
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c
index f33e349c4ec5..952201c6d821 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.c
+++ b/drivers/gpu/drm/qxl/qxl_drv.c
@@ -59,6 +59,11 @@ module_param_named(num_heads, qxl_num_crtc, int, 0400);
 static struct drm_driver qxl_driver;
 static struct pci_driver qxl_pci_driver;
 
+static bool is_vga(struct pci_dev *pdev)
+{
+        return pdev->class == PCI_CLASS_DISPLAY_VGA << 8;
+}
+
 static int
 qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -83,9 +88,17 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (ret)
                 goto disable_pci;
 
+        if (is_vga(pdev)) {
+                ret = vga_get_interruptible(pdev, VGA_RSRC_LEGACY_IO);
+                if (ret) {
+                        DRM_ERROR("can't get legacy vga ioports\n");
+                        goto disable_pci;
+                }
+        }
+
         ret = qxl_device_init(qdev, &qxl_driver, pdev);
         if (ret)
-                goto disable_pci;
+                goto put_vga;
 
         ret = qxl_modeset_init(qdev);
         if (ret)
@@ -105,6 +118,9 @@ modeset_cleanup:
         qxl_modeset_fini(qdev);
 unload:
         qxl_device_fini(qdev);
+put_vga:
+        if (is_vga(pdev))
+                vga_put(pdev, VGA_RSRC_LEGACY_IO);
 disable_pci:
         pci_disable_device(pdev);
 free_dev:
@@ -122,6 +138,8 @@ qxl_pci_remove(struct pci_dev *pdev)
 
         qxl_modeset_fini(qdev);
         qxl_device_fini(qdev);
+        if (is_vga(pdev))
+                vga_put(pdev, VGA_RSRC_LEGACY_IO);
 
         dev->dev_private = NULL;
         kfree(qdev);
diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
index 1c62578590f4..082d02c84024 100644
--- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
+++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
@@ -673,10 +673,8 @@ static int rcar_lvds_parse_dt_companion(struct rcar_lvds *lvds)
 
         /* Locate the companion LVDS encoder for dual-link operation, if any. */
         companion = of_parse_phandle(dev->of_node, "renesas,companion", 0);
-        if (!companion) {
-                dev_err(dev, "Companion LVDS encoder not found\n");
-                return -ENXIO;
-        }
+        if (!companion)
+                return 0;
 
         /*
          * Sanity check: the companion encoder must have the same compatible
diff --git a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
index b45824ec7c8f..6d61a0eb5d64 100644
--- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
+++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
@@ -9,6 +9,13 @@
 
 #define cmdline_test(test)      selftest(test, test)
 
+cmdline_test(drm_cmdline_test_force_d_only)
+cmdline_test(drm_cmdline_test_force_D_only_dvi)
+cmdline_test(drm_cmdline_test_force_D_only_hdmi)
+cmdline_test(drm_cmdline_test_force_D_only_not_digital)
+cmdline_test(drm_cmdline_test_force_e_only)
+cmdline_test(drm_cmdline_test_margin_only)
+cmdline_test(drm_cmdline_test_interlace_only)
 cmdline_test(drm_cmdline_test_res)
 cmdline_test(drm_cmdline_test_res_missing_x)
 cmdline_test(drm_cmdline_test_res_missing_y)
diff --git a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
index 14c96edb13df..013de9d27c35 100644
--- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
+++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
@@ -17,6 +17,136 @@
 
 static const struct drm_connector no_connector = {};
 
+static int drm_cmdline_test_force_e_only(void *ignored)
+{
+        struct drm_cmdline_mode mode = { };
+
+        FAIL_ON(!drm_mode_parse_command_line_for_connector("e",
+                                                           &no_connector,
+                                                           &mode));
+        FAIL_ON(mode.specified);
+        FAIL_ON(mode.refresh_specified);
+        FAIL_ON(mode.bpp_specified);
+
+        FAIL_ON(mode.rb);
+        FAIL_ON(mode.cvt);
+        FAIL_ON(mode.interlace);
+        FAIL_ON(mode.margins);
+        FAIL_ON(mode.force != DRM_FORCE_ON);
+
+        return 0;
+}
+
+static int drm_cmdline_test_force_D_only_not_digital(void *ignored)
+{
+        struct drm_cmdline_mode mode = { };
+
+        FAIL_ON(!drm_mode_parse_command_line_for_connector("D",
+                                                           &no_connector,
+                                                           &mode));
+        FAIL_ON(mode.specified);
+        FAIL_ON(mode.refresh_specified);
+        FAIL_ON(mode.bpp_specified);
+
+        FAIL_ON(mode.rb);
+        FAIL_ON(mode.cvt);
+        FAIL_ON(mode.interlace);
+        FAIL_ON(mode.margins);
+        FAIL_ON(mode.force != DRM_FORCE_ON);
+
+        return 0;
+}
+
+static const struct drm_connector connector_hdmi = {
+        .connector_type = DRM_MODE_CONNECTOR_HDMIB,
+};
+
+static int drm_cmdline_test_force_D_only_hdmi(void *ignored)
+{
+        struct drm_cmdline_mode mode = { };
+
+        FAIL_ON(!drm_mode_parse_command_line_for_connector("D",
+                                                           &connector_hdmi,
+                                                           &mode));
+        FAIL_ON(mode.specified);
+        FAIL_ON(mode.refresh_specified);
+        FAIL_ON(mode.bpp_specified);
+
+        FAIL_ON(mode.rb);
+        FAIL_ON(mode.cvt);
+        FAIL_ON(mode.interlace);
+        FAIL_ON(mode.margins);
+        FAIL_ON(mode.force != DRM_FORCE_ON_DIGITAL);
+
+        return 0;
+}
+
+static const struct drm_connector connector_dvi = {
+        .connector_type = DRM_MODE_CONNECTOR_DVII,
+};
+
+static int drm_cmdline_test_force_D_only_dvi(void *ignored)
+{
+        struct drm_cmdline_mode mode = { };
+
+        FAIL_ON(!drm_mode_parse_command_line_for_connector("D",
+                                                           &connector_dvi,
+                                                           &mode));
+        FAIL_ON(mode.specified);
+        FAIL_ON(mode.refresh_specified);
+        FAIL_ON(mode.bpp_specified);
+
+        FAIL_ON(mode.rb);
+        FAIL_ON(mode.cvt);
+        FAIL_ON(mode.interlace);
+        FAIL_ON(mode.margins);
+        FAIL_ON(mode.force != DRM_FORCE_ON_DIGITAL);
+
+        return 0;
+}
+
+static int drm_cmdline_test_force_d_only(void *ignored)
+{
+        struct drm_cmdline_mode mode = { };
+
+        FAIL_ON(!drm_mode_parse_command_line_for_connector("d",
+                                                           &no_connector,
+                                                           &mode));
+        FAIL_ON(mode.specified);
+        FAIL_ON(mode.refresh_specified);
+        FAIL_ON(mode.bpp_specified);
+
+        FAIL_ON(mode.rb);
+        FAIL_ON(mode.cvt);
+        FAIL_ON(mode.interlace);
+        FAIL_ON(mode.margins);
+        FAIL_ON(mode.force != DRM_FORCE_OFF);
+
+        return 0;
+}
+
+static int drm_cmdline_test_margin_only(void *ignored)
+{
+        struct drm_cmdline_mode mode = { };
+
+        FAIL_ON(drm_mode_parse_command_line_for_connector("m",
+                                                          &no_connector,
+                                                          &mode));
+
+        return 0;
+}
+
+static int drm_cmdline_test_interlace_only(void *ignored)
+{
+        struct drm_cmdline_mode mode = { };
+
+        FAIL_ON(drm_mode_parse_command_line_for_connector("i",
+                                                          &no_connector,
+                                                          &mode));
+
+        return 0;
+}
+
 static int drm_cmdline_test_res(void *ignored)
 {
         struct drm_cmdline_mode mode = { };
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
index 64c43ee6bd92..df0cc8f46d7b 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -314,6 +314,7 @@ static void sun4i_tcon0_mode_set_dithering(struct sun4i_tcon *tcon,
                 /* R and B components are only 5 bits deep */
                 val |= SUN4I_TCON0_FRM_CTL_MODE_R;
                 val |= SUN4I_TCON0_FRM_CTL_MODE_B;
+                /* Fall through */
         case MEDIA_BUS_FMT_RGB666_1X18:
         case MEDIA_BUS_FMT_RGB666_1X7X3_SPWG:
                 /* Fall through: enable dithering */
diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
index a1fc8b520985..b889ad3e86e1 100644
--- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
@@ -993,6 +993,7 @@ static ssize_t sun6i_dsi_transfer(struct mipi_dsi_host *host,
                         ret = sun6i_dsi_dcs_read(dsi, msg);
                         break;
                 }
+                /* Else, fall through */
 
         default:
                 ret = -EINVAL;
diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
index b2da31310d24..09b526518f5a 100644
--- a/drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/drivers/gpu/drm/virtio/virtgpu_object.c
@@ -204,6 +204,7 @@ int virtio_gpu_object_get_sg_table(struct virtio_gpu_device *qdev,
                 .interruptible = false,
                 .no_wait_gpu = false
         };
+        size_t max_segment;
 
         /* wtf swapping */
         if (bo->pages)
@@ -215,8 +216,13 @@ int virtio_gpu_object_get_sg_table(struct virtio_gpu_device *qdev,
         if (!bo->pages)
                 goto out;
 
-        ret = sg_alloc_table_from_pages(bo->pages, pages, nr_pages, 0,
-                                        nr_pages << PAGE_SHIFT, GFP_KERNEL);
+        max_segment = virtio_max_dma_size(qdev->vdev);
+        max_segment &= PAGE_MASK;
+        if (max_segment > SCATTERLIST_MAX_SEGMENT)
+                max_segment = SCATTERLIST_MAX_SEGMENT;
+        ret = __sg_alloc_table_from_pages(bo->pages, pages, nr_pages, 0,
+                                          nr_pages << PAGE_SHIFT,
+                                          max_segment, GFP_KERNEL);
         if (ret)
                 goto out;
         return 0;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
index 59e9d05ab928..0af048d1a815 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
@@ -353,7 +353,7 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg,
                                      !!(HIGH_WORD(ecx) & MESSAGE_STATUS_HB));
                 if ((HIGH_WORD(ebx) & MESSAGE_STATUS_SUCCESS) == 0) {
                         kfree(reply);
-
+                        reply = NULL;
                         if ((HIGH_WORD(ebx) & MESSAGE_STATUS_CPT) != 0) {
                                 /* A checkpoint occurred. Retry. */
                                 continue;
@@ -377,7 +377,7 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg,
 
                 if ((HIGH_WORD(ecx) & MESSAGE_STATUS_SUCCESS) == 0) {
                         kfree(reply);
-
+                        reply = NULL;
                         if ((HIGH_WORD(ecx) & MESSAGE_STATUS_CPT) != 0) {
                                 /* A checkpoint occurred. Retry. */
                                 continue;
@@ -389,10 +389,8 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg,
                 break;
         }
 
-        if (retries == RETRIES) {
-                kfree(reply);
+        if (!reply)
                 return -EINVAL;
-        }
 
         *msg_len = reply_len;
         *msg     = reply;
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c
index 2310c96ccf4a..db1b55df0d13 100644
--- a/drivers/hid/hid-cp2112.c
+++ b/drivers/hid/hid-cp2112.c
@@ -1153,8 +1153,6 @@ static unsigned int cp2112_gpio_irq_startup(struct irq_data *d)
 
         INIT_DELAYED_WORK(&dev->gpio_poll_worker, cp2112_gpio_poll_callback);
 
-        cp2112_gpio_direction_input(gc, d->hwirq);
-
         if (!dev->gpio_poll) {
                 dev->gpio_poll = true;
                 schedule_delayed_work(&dev->gpio_poll_worker, 0);
@@ -1204,6 +1202,12 @@ static int __maybe_unused cp2112_allocate_irq(struct cp2112_device *dev,
                 return PTR_ERR(dev->desc[pin]);
         }
 
+        ret = cp2112_gpio_direction_input(&dev->gc, pin);
+        if (ret < 0) {
+                dev_err(dev->gc.parent, "Failed to set GPIO to input dir\n");
+                goto err_desc;
+        }
+
         ret = gpiochip_lock_as_irq(&dev->gc, pin);
         if (ret) {
                 dev_err(dev->gc.parent, "Failed to lock GPIO as interrupt\n");
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index 21268c9fa71a..0179f7ed77e5 100644
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -3749,30 +3749,8 @@ static const struct hid_device_id hidpp_devices[] = {
 
         { L27MHZ_DEVICE(HID_ANY_ID) },
 
-        { /* Logitech G203/Prodigy Gaming Mouse */
-          HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC084) },
-        { /* Logitech G302 Gaming Mouse */
-          HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07F) },
-        { /* Logitech G303 Gaming Mouse */
-          HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC080) },
-        { /* Logitech G400 Gaming Mouse */
-          HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07E) },
         { /* Logitech G403 Wireless Gaming Mouse over USB */
           HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC082) },
-        { /* Logitech G403 Gaming Mouse */
-          HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC083) },
-        { /* Logitech G403 Hero Gaming Mouse over USB */
-          HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC08F) },
-        { /* Logitech G502 Proteus Core Gaming Mouse */
-          HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07D) },
-        { /* Logitech G502 Proteus Spectrum Gaming Mouse over USB */
-          HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC332) },
-        { /* Logitech G502 Hero Gaming Mouse over USB */
-          HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC08B) },
-        { /* Logitech G700 Gaming Mouse over USB */
-          HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC06B) },
-        { /* Logitech G700s Gaming Mouse over USB */
-          HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07C) },
         { /* Logitech G703 Gaming Mouse over USB */
           HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC087) },
         { /* Logitech G703 Hero Gaming Mouse over USB */
diff --git a/drivers/hid/intel-ish-hid/ipc/hw-ish.h b/drivers/hid/intel-ish-hid/ipc/hw-ish.h
index 1065692f90e2..5792a104000a 100644
--- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h
+++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h
@@ -24,6 +24,7 @@
 #define ICL_MOBILE_DEVICE_ID    0x34FC
 #define SPT_H_DEVICE_ID         0xA135
 #define CML_LP_DEVICE_ID        0x02FC
+#define EHL_Ax_DEVICE_ID        0x4BB3
 
 #define REVISION_ID_CHT_A0      0x6
 #define REVISION_ID_CHT_Ax_SI   0x0
diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
index aa80b4d3b740..279567baca3d 100644
--- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
+++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
@@ -33,6 +33,7 @@ static const struct pci_device_id ish_pci_tbl[] = {
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ICL_MOBILE_DEVICE_ID)},
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, SPT_H_DEVICE_ID)},
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CML_LP_DEVICE_ID)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, EHL_Ax_DEVICE_ID)},
         {0, }
 };
 MODULE_DEVICE_TABLE(pci, ish_pci_tbl);
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 7a8ddc999a8e..1713235d28cb 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -846,6 +846,8 @@ static int wacom_intuos_general(struct wacom_wac *wacom)
                 y >>= 1;
                 distance >>= 1;
         }
+        if (features->type == INTUOSHT2)
+                distance = features->distance_max - distance;
         input_report_abs(input, ABS_X, x);
         input_report_abs(input, ABS_Y, y);
         input_report_abs(input, ABS_DISTANCE, distance);
@@ -1059,7 +1061,7 @@ static int wacom_remote_irq(struct wacom_wac *wacom_wac, size_t len)
         input_report_key(input, BTN_BASE2, (data[11] & 0x02));
 
         if (data[12] & 0x80)
-                input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f));
+                input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f) - 1);
         else
                 input_report_abs(input, ABS_WHEEL, 0);
 
@@ -1290,7 +1292,8 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
                 }
                 if (wacom->tool[0]) {
                         input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5]));
-                        if (wacom->features.type == INTUOSP2_BT) {
+                        if (wacom->features.type == INTUOSP2_BT ||
+                            wacom->features.type == INTUOSP2S_BT) {
                                 input_report_abs(pen_input, ABS_DISTANCE,
                                                  range ? frame[13] : wacom->features.distance_max);
                         } else {
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 5f9505a087f6..23f358cb7f49 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -26,7 +26,7 @@
 
 static unsigned long virt_to_hvpfn(void *addr)
 {
-        unsigned long paddr;
+        phys_addr_t paddr;
 
         if (is_vmalloc_addr(addr))
                 paddr = page_to_phys(vmalloc_to_page(addr)) +
diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
index 362e70e9d145..fb16a622e8ab 100644
--- a/drivers/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
@@ -146,8 +146,6 @@ struct hv_context {
          */
         u64 guestid;
 
-        void *tsc_page;
-
         struct hv_per_cpu_context __percpu *cpu_context;
 
         /*
diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c
index c0378c3de9a4..91dfeba62485 100644
--- a/drivers/hwtracing/intel_th/pci.c
+++ b/drivers/hwtracing/intel_th/pci.c
@@ -165,6 +165,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = {
                 .driver_data = (kernel_ulong_t)0,
         },
         {
+                /* Lewisburg PCH */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa226),
+                .driver_data = (kernel_ulong_t)0,
+        },
+        {
                 /* Gemini Lake */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x318e),
                 .driver_data = (kernel_ulong_t)&intel_th_2x,
@@ -199,6 +204,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = {
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x45c5),
                 .driver_data = (kernel_ulong_t)&intel_th_2x,
         },
+        {
+                /* Tiger Lake PCH */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa0a6),
+                .driver_data = (kernel_ulong_t)&intel_th_2x,
+        },
         { 0 },
 };
 
diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c
index e55b902560de..181e7ff1ec4f 100644
--- a/drivers/hwtracing/stm/core.c
+++ b/drivers/hwtracing/stm/core.c
@@ -1276,7 +1276,6 @@ int stm_source_register_device(struct device *parent,
 
 err:
         put_device(&src->dev);
-        kfree(src);
 
         return err;
 }
diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c
index d7fd76baec92..19ef2b0c682a 100644
--- a/drivers/i2c/busses/i2c-bcm-iproc.c
+++ b/drivers/i2c/busses/i2c-bcm-iproc.c
@@ -790,7 +790,10 @@ static int bcm_iproc_i2c_xfer(struct i2c_adapter *adapter,
 
 static uint32_t bcm_iproc_i2c_functionality(struct i2c_adapter *adap)
 {
-        u32 val = I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
+        u32 val;
+
+        /* We do not support the SMBUS Quick command */
+        val = I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK);
 
         if (adap->algo->reg_slave)
                 val |= I2C_FUNC_SLAVE;
diff --git a/drivers/i2c/busses/i2c-designware-slave.c b/drivers/i2c/busses/i2c-designware-slave.c
index e7f9305b2dd9..f5f001738df5 100644
--- a/drivers/i2c/busses/i2c-designware-slave.c
+++ b/drivers/i2c/busses/i2c-designware-slave.c
@@ -94,6 +94,7 @@ static int i2c_dw_unreg_slave(struct i2c_client *slave)
 
         dev->disable_int(dev);
         dev->disable(dev);
+        synchronize_irq(dev->irq);
         dev->slave = NULL;
         pm_runtime_put(dev->dev);
 
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index f2956936c3f2..2e08b4722dc4 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -1194,19 +1194,28 @@ static acpi_status check_acpi_smo88xx_device(acpi_handle obj_handle,
         int i;
 
         status = acpi_get_object_info(obj_handle, &info);
-        if (!ACPI_SUCCESS(status) || !(info->valid & ACPI_VALID_HID))
+        if (ACPI_FAILURE(status))
                 return AE_OK;
 
+        if (!(info->valid & ACPI_VALID_HID))
+                goto smo88xx_not_found;
+
         hid = info->hardware_id.string;
         if (!hid)
-                return AE_OK;
+                goto smo88xx_not_found;
 
         i = match_string(acpi_smo8800_ids, ARRAY_SIZE(acpi_smo8800_ids), hid);
         if (i < 0)
-                return AE_OK;
+                goto smo88xx_not_found;
+
+        kfree(info);
 
         *((bool *)return_value) = true;
         return AE_CTRL_TERMINATE;
+
+smo88xx_not_found:
+        kfree(info);
+        return AE_OK;
 }
 
 static bool is_dell_system_with_lis3lv02d(void)
diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c
index 252edb433fdf..29eae1bf4f86 100644
--- a/drivers/i2c/busses/i2c-mt65xx.c
+++ b/drivers/i2c/busses/i2c-mt65xx.c
@@ -234,6 +234,10 @@ static const struct i2c_adapter_quirks mt7622_i2c_quirks = {
         .max_num_msgs = 255,
 };
 
+static const struct i2c_adapter_quirks mt8183_i2c_quirks = {
+        .flags = I2C_AQ_NO_ZERO_LEN,
+};
+
 static const struct mtk_i2c_compatible mt2712_compat = {
         .regs = mt_i2c_regs_v1,
         .pmic_i2c = 0,
@@ -298,6 +302,7 @@ static const struct mtk_i2c_compatible mt8173_compat = {
 };
 
 static const struct mtk_i2c_compatible mt8183_compat = {
+        .quirks = &mt8183_i2c_quirks,
         .regs = mt_i2c_regs_v2,
         .pmic_i2c = 0,
         .dcm = 0,
@@ -870,7 +875,11 @@ static irqreturn_t mtk_i2c_irq(int irqno, void *dev_id)
 
 static u32 mtk_i2c_functionality(struct i2c_adapter *adap)
 {
-        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
+        if (adap->quirks->flags & I2C_AQ_NO_ZERO_LEN)
+                return I2C_FUNC_I2C |
+                        (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK);
+        else
+                return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
 }
 
 static const struct i2c_algorithm mtk_i2c_algorithm = {
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index c46c4bddc7ca..cba325eb852f 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -91,7 +91,7 @@
 #define SB800_PIIX4_PORT_IDX_MASK       0x06
 #define SB800_PIIX4_PORT_IDX_SHIFT      1
 
-/* On kerncz, SmBus0Sel is at bit 20:19 of PMx00 DecodeEn */
+/* On kerncz and Hudson2, SmBus0Sel is at bit 20:19 of PMx00 DecodeEn */
 #define SB800_PIIX4_PORT_IDX_KERNCZ             0x02
 #define SB800_PIIX4_PORT_IDX_MASK_KERNCZ        0x18
 #define SB800_PIIX4_PORT_IDX_SHIFT_KERNCZ       3
@@ -358,18 +358,16 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
         /* Find which register is used for port selection */
         if (PIIX4_dev->vendor == PCI_VENDOR_ID_AMD ||
             PIIX4_dev->vendor == PCI_VENDOR_ID_HYGON) {
-                switch (PIIX4_dev->device) {
-                case PCI_DEVICE_ID_AMD_KERNCZ_SMBUS:
+                if (PIIX4_dev->device == PCI_DEVICE_ID_AMD_KERNCZ_SMBUS ||
+                    (PIIX4_dev->device == PCI_DEVICE_ID_AMD_HUDSON2_SMBUS &&
+                     PIIX4_dev->revision >= 0x1F)) {
                         piix4_port_sel_sb800 = SB800_PIIX4_PORT_IDX_KERNCZ;
                         piix4_port_mask_sb800 = SB800_PIIX4_PORT_IDX_MASK_KERNCZ;
                         piix4_port_shift_sb800 = SB800_PIIX4_PORT_IDX_SHIFT_KERNCZ;
-                        break;
-                case PCI_DEVICE_ID_AMD_HUDSON2_SMBUS:
-                default:
+                } else {
                         piix4_port_sel_sb800 = SB800_PIIX4_PORT_IDX_ALT;
                         piix4_port_mask_sb800 = SB800_PIIX4_PORT_IDX_MASK;
                         piix4_port_shift_sb800 = SB800_PIIX4_PORT_IDX_SHIFT;
-                        break;
                 }
         } else {
                 if (!request_muxed_region(SB800_PIIX4_SMB_IDX, 2,
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index f26ed495d384..9c440fa6a3dd 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -832,7 +832,7 @@ EXPORT_SYMBOL_GPL(i2c_new_device);
  */
 void i2c_unregister_device(struct i2c_client *client)
 {
-        if (!client)
+        if (IS_ERR_OR_NULL(client))
                 return;
 
         if (client->dev.of_node) {
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 19f1730a4f24..a68d0ccf67a4 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -4724,10 +4724,14 @@ static int __init cma_init(void)
         if (ret)
                 goto err;
 
-        cma_configfs_init();
+        ret = cma_configfs_init();
+        if (ret)
+                goto err_ib;
 
         return 0;
 
+err_ib:
+        ib_unregister_client(&cma_client);
 err:
         unregister_netdevice_notifier(&cma_nb);
         ib_sa_unregister_client(&sa_client);
diff --git a/drivers/infiniband/core/counters.c b/drivers/infiniband/core/counters.c
index b79890739a2c..af8c85d18e62 100644
--- a/drivers/infiniband/core/counters.c
+++ b/drivers/infiniband/core/counters.c
@@ -149,13 +149,11 @@ static bool auto_mode_match(struct ib_qp *qp, struct rdma_counter *counter,
         struct auto_mode_param *param = &counter->mode.param;
         bool match = true;
 
-        if (rdma_is_kernel_res(&counter->res) != rdma_is_kernel_res(&qp->res))
+        if (!rdma_is_visible_in_pid_ns(&qp->res))
                 return false;
 
-        /* Ensure that counter belong to right PID */
-        if (!rdma_is_kernel_res(&counter->res) &&
-            !rdma_is_kernel_res(&qp->res) &&
-            (task_pid_vnr(counter->res.task) != current->pid))
+        /* Ensure that counter belongs to the right PID */
+        if (task_pid_nr(counter->res.task) != task_pid_nr(qp->res.task))
                 return false;
 
         if (auto_mask & RDMA_COUNTER_MASK_QP_TYPE)
@@ -424,7 +422,7 @@ static struct ib_qp *rdma_counter_get_qp(struct ib_device *dev, u32 qp_num)
         return qp;
 
 err:
-        rdma_restrack_put(&qp->res);
+        rdma_restrack_put(res);
         return NULL;
 }
 
diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
index 87d40d1ecdde..020c26976558 100644
--- a/drivers/infiniband/core/nldev.c
+++ b/drivers/infiniband/core/nldev.c
@@ -382,8 +382,7 @@ static int fill_res_info(struct sk_buff *msg, struct ib_device *device)
         for (i = 0; i < RDMA_RESTRACK_MAX; i++) {
                 if (!names[i])
                         continue;
-                curr = rdma_restrack_count(device, i,
-                                           task_active_pid_ns(current));
+                curr = rdma_restrack_count(device, i);
                 ret = fill_res_info_entry(msg, names[i], curr);
                 if (ret)
                         goto err;
diff --git a/drivers/infiniband/core/restrack.c b/drivers/infiniband/core/restrack.c
index bddff426ee0f..a07665f7ef8c 100644
--- a/drivers/infiniband/core/restrack.c
+++ b/drivers/infiniband/core/restrack.c
@@ -107,10 +107,8 @@ void rdma_restrack_clean(struct ib_device *dev)
  * rdma_restrack_count() - the current usage of specific object
  * @dev:  IB device
  * @type: actual type of object to operate
- * @ns:   PID namespace
  */
-int rdma_restrack_count(struct ib_device *dev, enum rdma_restrack_type type,
-                        struct pid_namespace *ns)
+int rdma_restrack_count(struct ib_device *dev, enum rdma_restrack_type type)
 {
         struct rdma_restrack_root *rt = &dev->res[type];
         struct rdma_restrack_entry *e;
@@ -119,10 +117,9 @@ int rdma_restrack_count(struct ib_device *dev, enum rdma_restrack_type type,
 
         xa_lock(&rt->xa);
         xas_for_each(&xas, e, U32_MAX) {
-                if (ns == &init_pid_ns ||
-                    (!rdma_is_kernel_res(e) &&
-                     ns == task_active_pid_ns(e->task)))
-                        cnt++;
+                if (!rdma_is_visible_in_pid_ns(e))
+                        continue;
+                cnt++;
         }
         xa_unlock(&rt->xa);
         return cnt;
@@ -360,5 +357,7 @@ bool rdma_is_visible_in_pid_ns(struct rdma_restrack_entry *res)
          */
         if (rdma_is_kernel_res(res))
                 return task_active_pid_ns(current) == &init_pid_ns;
-        return task_active_pid_ns(current) == task_active_pid_ns(res->task);
+
+        /* PID 0 means that resource is not found in current namespace */
+        return task_pid_vnr(res->task);
 }
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index 08da840ed7ee..56553668256f 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -379,14 +379,9 @@ EXPORT_SYMBOL(ib_umem_release);
 
 int ib_umem_page_count(struct ib_umem *umem)
 {
-        int i;
-        int n;
+        int i, n = 0;
         struct scatterlist *sg;
 
-        if (umem->is_odp)
-                return ib_umem_num_pages(umem);
-
-        n = 0;
         for_each_sg(umem->sg_head.sgl, sg, umem->nmap, i)
                 n += sg_dma_len(sg) >> PAGE_SHIFT;
 
diff --git a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
index 48b04d2f175f..60c8f76aab33 100644
--- a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
+++ b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
@@ -136,6 +136,13 @@ static int __send_message(struct bnxt_qplib_rcfw *rcfw, struct cmdq_base *req,
                 spin_unlock_irqrestore(&cmdq->lock, flags);
                 return -EBUSY;
         }
+
+        size = req->cmd_size;
+        /* change the cmd_size to the number of 16byte cmdq unit.
+         * req->cmd_size is modified here
+         */
+        bnxt_qplib_set_cmd_slots(req);
+
         memset(resp, 0, sizeof(*resp));
         crsqe->resp = (struct creq_qp_event *)resp;
         crsqe->resp->cookie = req->cookie;
@@ -150,7 +157,6 @@ static int __send_message(struct bnxt_qplib_rcfw *rcfw, struct cmdq_base *req,
 
         cmdq_ptr = (struct bnxt_qplib_cmdqe **)cmdq->pbl_ptr;
         preq = (u8 *)req;
-        size = req->cmd_size * BNXT_QPLIB_CMDQE_UNITS;
         do {
                 /* Locate the next cmdq slot */
                 sw_prod = HWQ_CMP(cmdq->prod, cmdq);
diff --git a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.h b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.h
index 2138533bb642..dfeadc192e17 100644
--- a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.h
+++ b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.h
@@ -55,9 +55,7 @@
         do {                                                            \
                 memset(&(req), 0, sizeof((req)));                       \
                 (req).opcode = CMDQ_BASE_OPCODE_##CMD;                  \
-                (req).cmd_size = (sizeof((req)) +                       \
-                                BNXT_QPLIB_CMDQE_UNITS - 1) /           \
-                                BNXT_QPLIB_CMDQE_UNITS;                 \
+                (req).cmd_size = sizeof((req));                         \
                 (req).flags = cpu_to_le16(cmd_flags);                   \
         } while (0)
 
@@ -95,6 +93,13 @@ static inline u32 bnxt_qplib_cmdqe_cnt_per_pg(u32 depth)
                  BNXT_QPLIB_CMDQE_UNITS);
 }
 
+/* Set the cmd_size to a factor of CMDQE unit */
+static inline void bnxt_qplib_set_cmd_slots(struct cmdq_base *req)
+{
+        req->cmd_size = (req->cmd_size + BNXT_QPLIB_CMDQE_UNITS - 1) /
+                         BNXT_QPLIB_CMDQE_UNITS;
+}
+
 #define MAX_CMDQ_IDX(depth)             ((depth) - 1)
 
 static inline u32 bnxt_qplib_max_cmdq_idx_per_pg(u32 depth)
diff --git a/drivers/infiniband/hw/hfi1/fault.c b/drivers/infiniband/hw/hfi1/fault.c
index 93613e5def9b..986c12153e62 100644
--- a/drivers/infiniband/hw/hfi1/fault.c
+++ b/drivers/infiniband/hw/hfi1/fault.c
@@ -141,12 +141,14 @@ static ssize_t fault_opcodes_write(struct file *file, const char __user *buf,
         if (!data)
                 return -ENOMEM;
         copy = min(len, datalen - 1);
-        if (copy_from_user(data, buf, copy))
-                return -EFAULT;
+        if (copy_from_user(data, buf, copy)) {
+                ret = -EFAULT;
+                goto free_data;
+        }
 
         ret = debugfs_file_get(file->f_path.dentry);
         if (unlikely(ret))
-                return ret;
+                goto free_data;
         ptr = data;
         token = ptr;
         for (ptr = data; *ptr; ptr = end + 1, token = ptr) {
@@ -195,6 +197,7 @@ static ssize_t fault_opcodes_write(struct file *file, const char __user *buf,
         ret = len;
 
         debugfs_file_put(file->f_path.dentry);
+free_data:
         kfree(data);
         return ret;
 }
@@ -214,7 +217,7 @@ static ssize_t fault_opcodes_read(struct file *file, char __user *buf,
                 return -ENOMEM;
         ret = debugfs_file_get(file->f_path.dentry);
         if (unlikely(ret))
-                return ret;
+                goto free_data;
         bit = find_first_bit(fault->opcodes, bitsize);
         while (bit < bitsize) {
                 zero = find_next_zero_bit(fault->opcodes, bitsize, bit);
@@ -232,6 +235,7 @@ static ssize_t fault_opcodes_read(struct file *file, char __user *buf,
         data[size - 1] = '\n';
         data[size] = '\0';
         ret = simple_read_from_buffer(buf, len, pos, data, size);
+free_data:
         kfree(data);
         return ret;
 }
diff --git a/drivers/infiniband/hw/hfi1/tid_rdma.c b/drivers/infiniband/hw/hfi1/tid_rdma.c
index 996fc298207e..6141f4edc6bf 100644
--- a/drivers/infiniband/hw/hfi1/tid_rdma.c
+++ b/drivers/infiniband/hw/hfi1/tid_rdma.c
@@ -2574,18 +2574,9 @@ void hfi1_kern_read_tid_flow_free(struct rvt_qp *qp)
         hfi1_kern_clear_hw_flow(priv->rcd, qp);
 }
 
-static bool tid_rdma_tid_err(struct hfi1_ctxtdata *rcd,
-                             struct hfi1_packet *packet, u8 rcv_type,
-                             u8 opcode)
+static bool tid_rdma_tid_err(struct hfi1_packet *packet, u8 rcv_type)
 {
         struct rvt_qp *qp = packet->qp;
-        struct hfi1_qp_priv *qpriv = qp->priv;
-        u32 ipsn;
-        struct ib_other_headers *ohdr = packet->ohdr;
-        struct rvt_ack_entry *e;
-        struct tid_rdma_request *req;
-        struct rvt_dev_info *rdi = ib_to_rvt(qp->ibqp.device);
-        u32 i;
 
         if (rcv_type >= RHF_RCV_TYPE_IB)
                 goto done;
@@ -2602,41 +2593,9 @@ static bool tid_rdma_tid_err(struct hfi1_ctxtdata *rcd,
         if (rcv_type == RHF_RCV_TYPE_EAGER) {
                 hfi1_restart_rc(qp, qp->s_last_psn + 1, 1);
                 hfi1_schedule_send(qp);
-                goto done_unlock;
-        }
-
-        /*
-         * For TID READ response, error out QP after freeing the tid
-         * resources.
-         */
-        if (opcode == TID_OP(READ_RESP)) {
-                ipsn = mask_psn(be32_to_cpu(ohdr->u.tid_rdma.r_rsp.verbs_psn));
-                if (cmp_psn(ipsn, qp->s_last_psn) > 0 &&
-                    cmp_psn(ipsn, qp->s_psn) < 0) {
-                        hfi1_kern_read_tid_flow_free(qp);
-                        spin_unlock(&qp->s_lock);
-                        rvt_rc_error(qp, IB_WC_LOC_QP_OP_ERR);
-                        goto done;
-                }
-                goto done_unlock;
-        }
-
-        /*
-         * Error out the qp for TID RDMA WRITE
-         */
-        hfi1_kern_clear_hw_flow(qpriv->rcd, qp);
-        for (i = 0; i < rvt_max_atomic(rdi); i++) {
-                e = &qp->s_ack_queue[i];
-                if (e->opcode == TID_OP(WRITE_REQ)) {
-                        req = ack_to_tid_req(e);
-                        hfi1_kern_exp_rcv_clear_all(req);
-                }
         }
-        spin_unlock(&qp->s_lock);
-        rvt_rc_error(qp, IB_WC_LOC_LEN_ERR);
-        goto done;
 
-done_unlock:
+        /* Since no payload is delivered, just drop the packet */
         spin_unlock(&qp->s_lock);
 done:
         return true;
@@ -2687,12 +2646,12 @@ static bool handle_read_kdeth_eflags(struct hfi1_ctxtdata *rcd,
         u32 fpsn;
 
         lockdep_assert_held(&qp->r_lock);
+        spin_lock(&qp->s_lock);
         /* If the psn is out of valid range, drop the packet */
         if (cmp_psn(ibpsn, qp->s_last_psn) < 0 ||
             cmp_psn(ibpsn, qp->s_psn) > 0)
-                return ret;
+                goto s_unlock;
 
-        spin_lock(&qp->s_lock);
         /*
          * Note that NAKs implicitly ACK outstanding SEND and RDMA write
          * requests and implicitly NAK RDMA read and atomic requests issued
@@ -2740,9 +2699,12 @@ static bool handle_read_kdeth_eflags(struct hfi1_ctxtdata *rcd,
 
                 wqe = do_rc_completion(qp, wqe, ibp);
                 if (qp->s_acked == qp->s_tail)
-                        break;
+                        goto s_unlock;
         }
 
+        if (qp->s_acked == qp->s_tail)
+                goto s_unlock;
+
         /* Handle the eflags for the request */
         if (wqe->wr.opcode != IB_WR_TID_RDMA_READ)
                 goto s_unlock;
@@ -2922,7 +2884,7 @@ bool hfi1_handle_kdeth_eflags(struct hfi1_ctxtdata *rcd,
                 if (lnh == HFI1_LRH_GRH)
                         goto r_unlock;
 
-                if (tid_rdma_tid_err(rcd, packet, rcv_type, opcode))
+                if (tid_rdma_tid_err(packet, rcv_type))
                         goto r_unlock;
         }
 
@@ -2942,8 +2904,15 @@ bool hfi1_handle_kdeth_eflags(struct hfi1_ctxtdata *rcd,
          */
         spin_lock(&qp->s_lock);
         qpriv = qp->priv;
+        if (qpriv->r_tid_tail == HFI1_QP_WQE_INVALID ||
+            qpriv->r_tid_tail == qpriv->r_tid_head)
+                goto unlock;
         e = &qp->s_ack_queue[qpriv->r_tid_tail];
+        if (e->opcode != TID_OP(WRITE_REQ))
+                goto unlock;
         req = ack_to_tid_req(e);
+        if (req->comp_seg == req->cur_seg)
+                goto unlock;
         flow = &req->flows[req->clear_tail];
         trace_hfi1_eflags_err_write(qp, rcv_type, rte, psn);
         trace_hfi1_rsp_handle_kdeth_eflags(qp, psn);
@@ -4509,7 +4478,7 @@ void hfi1_rc_rcv_tid_rdma_ack(struct hfi1_packet *packet)
         struct rvt_swqe *wqe;
         struct tid_rdma_request *req;
         struct tid_rdma_flow *flow;
-        u32 aeth, psn, req_psn, ack_psn, resync_psn, ack_kpsn;
+        u32 aeth, psn, req_psn, ack_psn, flpsn, resync_psn, ack_kpsn;
         unsigned long flags;
         u16 fidx;
 
@@ -4538,6 +4507,9 @@ void hfi1_rc_rcv_tid_rdma_ack(struct hfi1_packet *packet)
                 ack_kpsn--;
         }
 
+        if (unlikely(qp->s_acked == qp->s_tail))
+                goto ack_op_err;
+
         wqe = rvt_get_swqe_ptr(qp, qp->s_acked);
 
         if (wqe->wr.opcode != IB_WR_TID_RDMA_WRITE)
@@ -4550,7 +4522,8 @@ void hfi1_rc_rcv_tid_rdma_ack(struct hfi1_packet *packet)
         trace_hfi1_tid_flow_rcv_tid_ack(qp, req->acked_tail, flow);
 
         /* Drop stale ACK/NAK */
-        if (cmp_psn(psn, full_flow_psn(flow, flow->flow_state.spsn)) < 0)
+        if (cmp_psn(psn, full_flow_psn(flow, flow->flow_state.spsn)) < 0 ||
+            cmp_psn(req_psn, flow->flow_state.resp_ib_psn) < 0)
                 goto ack_op_err;
 
         while (cmp_psn(ack_kpsn,
@@ -4712,7 +4685,12 @@ done:
                 switch ((aeth >> IB_AETH_CREDIT_SHIFT) &
                         IB_AETH_CREDIT_MASK) {
                 case 0: /* PSN sequence error */
+                        if (!req->flows)
+                                break;
                         flow = &req->flows[req->acked_tail];
+                        flpsn = full_flow_psn(flow, flow->flow_state.lpsn);
+                        if (cmp_psn(psn, flpsn) > 0)
+                                break;
                         trace_hfi1_tid_flow_rcv_tid_ack(qp, req->acked_tail,
                                                         flow);
                         req->r_ack_psn = mask_psn(be32_to_cpu(ohdr->bth[2]));
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 68c951491a08..57079110af9b 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -1677,8 +1677,6 @@ tx_err:
                                     tx_buf_size, DMA_TO_DEVICE);
                 kfree(tun_qp->tx_ring[i].buf.addr);
         }
-        kfree(tun_qp->tx_ring);
-        tun_qp->tx_ring = NULL;
         i = MLX4_NUM_TUNNEL_BUFS;
 err:
         while (i > 0) {
@@ -1687,6 +1685,8 @@ err:
                                     rx_buf_size, DMA_FROM_DEVICE);
                 kfree(tun_qp->ring[i].addr);
         }
+        kfree(tun_qp->tx_ring);
+        tun_qp->tx_ring = NULL;
         kfree(tun_qp->ring);
         tun_qp->ring = NULL;
         return -ENOMEM;
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index e12a4404096b..0569bcab02d4 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -1023,7 +1023,7 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
         props->timestamp_mask = 0x7FFFFFFFFFFFFFFFULL;
 
         if (IS_ENABLED(CONFIG_INFINIBAND_ON_DEMAND_PAGING)) {
-                if (MLX5_CAP_GEN(mdev, pg))
+                if (dev->odp_caps.general_caps & IB_ODP_SUPPORT)
                         props->device_cap_flags |= IB_DEVICE_ON_DEMAND_PAGING;
                 props->odp_caps = dev->odp_caps;
         }
@@ -6139,6 +6139,8 @@ static int mlx5_ib_stage_init_init(struct mlx5_ib_dev *dev)
                 dev->port[i].roce.last_port_state = IB_PORT_DOWN;
         }
 
+        mlx5_ib_internal_fill_odp_caps(dev);
+
         err = mlx5_ib_init_multiport_master(dev);
         if (err)
                 return err;
@@ -6563,8 +6565,6 @@ static void mlx5_ib_stage_dev_res_cleanup(struct mlx5_ib_dev *dev)
 
 static int mlx5_ib_stage_odp_init(struct mlx5_ib_dev *dev)
 {
-        mlx5_ib_internal_fill_odp_caps(dev);
-
         return mlx5_ib_odp_init_one(dev);
 }
 
diff --git a/drivers/infiniband/hw/mlx5/mem.c b/drivers/infiniband/hw/mlx5/mem.c
index fe1a76d8531c..a40e0abf2338 100644
--- a/drivers/infiniband/hw/mlx5/mem.c
+++ b/drivers/infiniband/hw/mlx5/mem.c
@@ -57,9 +57,10 @@ void mlx5_ib_cont_pages(struct ib_umem *umem, u64 addr,
         int entry;
 
         if (umem->is_odp) {
-                unsigned int page_shift = to_ib_umem_odp(umem)->page_shift;
+                struct ib_umem_odp *odp = to_ib_umem_odp(umem);
+                unsigned int page_shift = odp->page_shift;
 
-                *ncont = ib_umem_page_count(umem);
+                *ncont = ib_umem_odp_num_pages(odp);
                 *count = *ncont << (page_shift - PAGE_SHIFT);
                 *shift = page_shift;
                 if (order)
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index f6a53455bf8b..9ae587b74b12 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -1475,4 +1475,18 @@ int bfregn_to_uar_index(struct mlx5_ib_dev *dev,
                         bool dyn_bfreg);
 
 int mlx5_ib_qp_set_counter(struct ib_qp *qp, struct rdma_counter *counter);
+
+static inline bool mlx5_ib_can_use_umr(struct mlx5_ib_dev *dev,
+                                       bool do_modify_atomic)
+{
+        if (MLX5_CAP_GEN(dev->mdev, umr_modify_entity_size_disabled))
+                return false;
+
+        if (do_modify_atomic &&
+            MLX5_CAP_GEN(dev->mdev, atomic) &&
+            MLX5_CAP_GEN(dev->mdev, umr_modify_atomic_disabled))
+                return false;
+
+        return true;
+}
 #endif /* MLX5_IB_H */
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index b74fad08412f..3401f5f6792e 100644
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -1293,9 +1293,7 @@ struct ib_mr *mlx5_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
         if (err < 0)
                 return ERR_PTR(err);
 
-        use_umr = !MLX5_CAP_GEN(dev->mdev, umr_modify_entity_size_disabled) &&
-                  (!MLX5_CAP_GEN(dev->mdev, umr_modify_atomic_disabled) ||
-                   !MLX5_CAP_GEN(dev->mdev, atomic));
+        use_umr = mlx5_ib_can_use_umr(dev, true);
 
         if (order <= mr_cache_max_order(dev) && use_umr) {
                 mr = alloc_mr_from_cache(pd, umem, virt_addr, length, ncont,
@@ -1448,7 +1446,8 @@ int mlx5_ib_rereg_user_mr(struct ib_mr *ib_mr, int flags, u64 start,
                         goto err;
         }
 
-        if (flags & IB_MR_REREG_TRANS && !use_umr_mtt_update(mr, addr, len)) {
+        if (!mlx5_ib_can_use_umr(dev, true) ||
+            (flags & IB_MR_REREG_TRANS && !use_umr_mtt_update(mr, addr, len))) {
                 /*
                  * UMR can't be used - MKey needs to be replaced.
                  */
diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c
index 1d257d1b3b0d..0a59912a4cef 100644
--- a/drivers/infiniband/hw/mlx5/odp.c
+++ b/drivers/infiniband/hw/mlx5/odp.c
@@ -301,7 +301,8 @@ void mlx5_ib_internal_fill_odp_caps(struct mlx5_ib_dev *dev)
 
         memset(caps, 0, sizeof(*caps));
 
-        if (!MLX5_CAP_GEN(dev->mdev, pg))
+        if (!MLX5_CAP_GEN(dev->mdev, pg) ||
+            !mlx5_ib_can_use_umr(dev, true))
                 return;
 
         caps->general_caps = IB_ODP_SUPPORT;
@@ -355,7 +356,8 @@ void mlx5_ib_internal_fill_odp_caps(struct mlx5_ib_dev *dev)
 
         if (MLX5_CAP_GEN(dev->mdev, fixed_buffer_size) &&
             MLX5_CAP_GEN(dev->mdev, null_mkey) &&
-            MLX5_CAP_GEN(dev->mdev, umr_extended_translation_offset))
+            MLX5_CAP_GEN(dev->mdev, umr_extended_translation_offset) &&
+            !MLX5_CAP_GEN(dev->mdev, umr_indirect_mkey_disabled))
                 caps->general_caps |= IB_ODP_SUPPORT_IMPLICIT;
 
         return;
@@ -1622,8 +1624,10 @@ int mlx5_ib_odp_init_one(struct mlx5_ib_dev *dev)
 {
         int ret = 0;
 
-        if (dev->odp_caps.general_caps & IB_ODP_SUPPORT)
-                ib_set_device_ops(&dev->ib_dev, &mlx5_ib_dev_odp_ops);
+        if (!(dev->odp_caps.general_caps & IB_ODP_SUPPORT))
+                return ret;
+
+        ib_set_device_ops(&dev->ib_dev, &mlx5_ib_dev_odp_ops);
 
         if (dev->odp_caps.general_caps & IB_ODP_SUPPORT_IMPLICIT) {
                 ret = mlx5_cmd_null_mkey(dev->mdev, &dev->null_mkey);
@@ -1633,9 +1637,6 @@ int mlx5_ib_odp_init_one(struct mlx5_ib_dev *dev)
                 }
         }
 
-        if (!MLX5_CAP_GEN(dev->mdev, pg))
-                return ret;
-
         ret = mlx5_ib_create_pf_eq(dev, &dev->odp_pf_eq);
 
         return ret;
@@ -1643,7 +1644,7 @@ int mlx5_ib_odp_init_one(struct mlx5_ib_dev *dev)
 
 void mlx5_ib_odp_cleanup_one(struct mlx5_ib_dev *dev)
 {
-        if (!MLX5_CAP_GEN(dev->mdev, pg))
+        if (!(dev->odp_caps.general_caps & IB_ODP_SUPPORT))
                 return;
 
         mlx5_ib_destroy_pf_eq(dev, &dev->odp_pf_eq);
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 379328b2598f..72869ff4a334 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -4162,7 +4162,7 @@ static u64 get_xlt_octo(u64 bytes)
                MLX5_IB_UMR_OCTOWORD;
 }
 
-static __be64 frwr_mkey_mask(void)
+static __be64 frwr_mkey_mask(bool atomic)
 {
         u64 result;
 
@@ -4175,10 +4175,12 @@ static __be64 frwr_mkey_mask(void)
                 MLX5_MKEY_MASK_LW               |
                 MLX5_MKEY_MASK_RR               |
                 MLX5_MKEY_MASK_RW               |
-                MLX5_MKEY_MASK_A                |
                 MLX5_MKEY_MASK_SMALL_FENCE      |
                 MLX5_MKEY_MASK_FREE;
 
+        if (atomic)
+                result |= MLX5_MKEY_MASK_A;
+
         return cpu_to_be64(result);
 }
 
@@ -4204,7 +4206,7 @@ static __be64 sig_mkey_mask(void)
 }
 
 static void set_reg_umr_seg(struct mlx5_wqe_umr_ctrl_seg *umr,
-                            struct mlx5_ib_mr *mr, u8 flags)
+                            struct mlx5_ib_mr *mr, u8 flags, bool atomic)
 {
         int size = (mr->ndescs + mr->meta_ndescs) * mr->desc_size;
 
@@ -4212,7 +4214,7 @@ static void set_reg_umr_seg(struct mlx5_wqe_umr_ctrl_seg *umr,
 
         umr->flags = flags;
         umr->xlt_octowords = cpu_to_be16(get_xlt_octo(size));
-        umr->mkey_mask = frwr_mkey_mask();
+        umr->mkey_mask = frwr_mkey_mask(atomic);
 }
 
 static void set_linv_umr_seg(struct mlx5_wqe_umr_ctrl_seg *umr)
@@ -4811,10 +4813,22 @@ static int set_reg_wr(struct mlx5_ib_qp *qp,
 {
         struct mlx5_ib_mr *mr = to_mmr(wr->mr);
         struct mlx5_ib_pd *pd = to_mpd(qp->ibqp.pd);
+        struct mlx5_ib_dev *dev = to_mdev(pd->ibpd.device);
         int mr_list_size = (mr->ndescs + mr->meta_ndescs) * mr->desc_size;
         bool umr_inline = mr_list_size <= MLX5_IB_SQ_UMR_INLINE_THRESHOLD;
+        bool atomic = wr->access & IB_ACCESS_REMOTE_ATOMIC;
         u8 flags = 0;
 
+        if (!mlx5_ib_can_use_umr(dev, atomic)) {
+                mlx5_ib_warn(to_mdev(qp->ibqp.device),
+                             "Fast update of %s for MR is disabled\n",
+                             (MLX5_CAP_GEN(dev->mdev,
+                                           umr_modify_entity_size_disabled)) ?
+                                     "entity size" :
+                                     "atomic access");
+                return -EINVAL;
+        }
+
         if (unlikely(wr->wr.send_flags & IB_SEND_INLINE)) {
                 mlx5_ib_warn(to_mdev(qp->ibqp.device),
                              "Invalid IB_SEND_INLINE send flag\n");
@@ -4826,7 +4840,7 @@ static int set_reg_wr(struct mlx5_ib_qp *qp,
         if (umr_inline)
                 flags |= MLX5_UMR_INLINE;
 
-        set_reg_umr_seg(*seg, mr, flags);
+        set_reg_umr_seg(*seg, mr, flags, atomic);
         *seg += sizeof(struct mlx5_wqe_umr_ctrl_seg);
         *size += sizeof(struct mlx5_wqe_umr_ctrl_seg) / 16;
         handle_post_send_edge(&qp->sq, seg, *size, cur_edge);
diff --git a/drivers/infiniband/sw/siw/siw.h b/drivers/infiniband/sw/siw/siw.h
index 77b1aabf6ff3..dba4535494ab 100644
--- a/drivers/infiniband/sw/siw/siw.h
+++ b/drivers/infiniband/sw/siw/siw.h
@@ -138,9 +138,9 @@ struct siw_umem {
 };
 
 struct siw_pble {
-        u64 addr; /* Address of assigned user buffer */
-        u64 size; /* Size of this entry */
-        u64 pbl_off; /* Total offset from start of PBL */
+        dma_addr_t addr; /* Address of assigned buffer */
+        unsigned int size; /* Size of this entry */
+        unsigned long pbl_off; /* Total offset from start of PBL */
 };
 
 struct siw_pbl {
@@ -734,7 +734,7 @@ static inline void siw_crc_skb(struct siw_rx_stream *srx, unsigned int len)
                   "MEM[0x%08x] %s: " fmt, mem->stag, __func__, ##__VA_ARGS__)
 
 #define siw_dbg_cep(cep, fmt, ...)                                             \
-        ibdev_dbg(&cep->sdev->base_dev, "CEP[0x%p] %s: " fmt,                  \
+        ibdev_dbg(&cep->sdev->base_dev, "CEP[0x%pK] %s: " fmt,                  \
                   cep, __func__, ##__VA_ARGS__)
 
 void siw_cq_flush(struct siw_cq *cq);
diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c
index 9ce8a1b925d2..8c1931a57f4a 100644
--- a/drivers/infiniband/sw/siw/siw_cm.c
+++ b/drivers/infiniband/sw/siw/siw_cm.c
@@ -355,8 +355,8 @@ static int siw_cm_upcall(struct siw_cep *cep, enum iw_cm_event_type reason,
                 getname_local(cep->sock, &event.local_addr);
                 getname_peer(cep->sock, &event.remote_addr);
         }
-        siw_dbg_cep(cep, "[QP %u]: id 0x%p, reason=%d, status=%d\n",
-                    cep->qp ? qp_id(cep->qp) : -1, id, reason, status);
+        siw_dbg_cep(cep, "[QP %u]: reason=%d, status=%d\n",
+                    cep->qp ? qp_id(cep->qp) : UINT_MAX, reason, status);
 
         return id->event_handler(id, &event);
 }
@@ -947,8 +947,6 @@ static void siw_accept_newconn(struct siw_cep *cep)
         siw_cep_get(new_cep);
         new_s->sk->sk_user_data = new_cep;
 
-        siw_dbg_cep(cep, "listen socket 0x%p, new 0x%p\n", s, new_s);
-
         if (siw_tcp_nagle == false) {
                 int val = 1;
 
@@ -1011,7 +1009,8 @@ static void siw_cm_work_handler(struct work_struct *w)
         cep = work->cep;
 
         siw_dbg_cep(cep, "[QP %u]: work type: %d, state %d\n",
-                    cep->qp ? qp_id(cep->qp) : -1, work->type, cep->state);
+                    cep->qp ? qp_id(cep->qp) : UINT_MAX,
+                    work->type, cep->state);
 
         siw_cep_set_inuse(cep);
 
@@ -1145,9 +1144,9 @@ static void siw_cm_work_handler(struct work_struct *w)
         }
         if (release_cep) {
                 siw_dbg_cep(cep,
-                            "release: timer=%s, QP[%u], id 0x%p\n",
+                            "release: timer=%s, QP[%u]\n",
                             cep->mpa_timer ? "y" : "n",
-                            cep->qp ? qp_id(cep->qp) : -1, cep->cm_id);
+                            cep->qp ? qp_id(cep->qp) : UINT_MAX);
 
                 siw_cancel_mpatimer(cep);
 
@@ -1211,8 +1210,8 @@ int siw_cm_queue_work(struct siw_cep *cep, enum siw_work_type type)
                 else
                         delay = MPAREP_TIMEOUT;
         }
-        siw_dbg_cep(cep, "[QP %u]: work type: %d, work 0x%p, timeout %lu\n",
-                    cep->qp ? qp_id(cep->qp) : -1, type, work, delay);
+        siw_dbg_cep(cep, "[QP %u]: work type: %d, timeout %lu\n",
+                    cep->qp ? qp_id(cep->qp) : -1, type, delay);
 
         queue_delayed_work(siw_cm_wq, &work->work, delay);
 
@@ -1376,16 +1375,16 @@ int siw_connect(struct iw_cm_id *id, struct iw_cm_conn_param *params)
         }
         if (v4)
                 siw_dbg_qp(qp,
-                           "id 0x%p, pd_len %d, laddr %pI4 %d, raddr %pI4 %d\n",
-                           id, pd_len,
+                           "pd_len %d, laddr %pI4 %d, raddr %pI4 %d\n",
+                           pd_len,
                            &((struct sockaddr_in *)(laddr))->sin_addr,
                            ntohs(((struct sockaddr_in *)(laddr))->sin_port),
                            &((struct sockaddr_in *)(raddr))->sin_addr,
                            ntohs(((struct sockaddr_in *)(raddr))->sin_port));
         else
                 siw_dbg_qp(qp,
-                           "id 0x%p, pd_len %d, laddr %pI6 %d, raddr %pI6 %d\n",
-                           id, pd_len,
+                           "pd_len %d, laddr %pI6 %d, raddr %pI6 %d\n",
+                           pd_len,
                            &((struct sockaddr_in6 *)(laddr))->sin6_addr,
                            ntohs(((struct sockaddr_in6 *)(laddr))->sin6_port),
                            &((struct sockaddr_in6 *)(raddr))->sin6_addr,
@@ -1508,14 +1507,13 @@ int siw_connect(struct iw_cm_id *id, struct iw_cm_conn_param *params)
         if (rv >= 0) {
                 rv = siw_cm_queue_work(cep, SIW_CM_WORK_MPATIMEOUT);
                 if (!rv) {
-                        siw_dbg_cep(cep, "id 0x%p, [QP %u]: exit\n", id,
-                                    qp_id(qp));
+                        siw_dbg_cep(cep, "[QP %u]: exit\n", qp_id(qp));
                         siw_cep_set_free(cep);
                         return 0;
                 }
         }
 error:
-        siw_dbg_qp(qp, "failed: %d\n", rv);
+        siw_dbg(id->device, "failed: %d\n", rv);
 
         if (cep) {
                 siw_socket_disassoc(s);
@@ -1540,7 +1538,8 @@ error:
         } else if (s) {
                 sock_release(s);
         }
-        siw_qp_put(qp);
+        if (qp)
+                siw_qp_put(qp);
 
         return rv;
 }
@@ -1580,7 +1579,7 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
         siw_cancel_mpatimer(cep);
 
         if (cep->state != SIW_EPSTATE_RECVD_MPAREQ) {
-                siw_dbg_cep(cep, "id 0x%p: out of state\n", id);
+                siw_dbg_cep(cep, "out of state\n");
 
                 siw_cep_set_free(cep);
                 siw_cep_put(cep);
@@ -1601,7 +1600,7 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
                 up_write(&qp->state_lock);
                 goto error;
         }
-        siw_dbg_cep(cep, "id 0x%p\n", id);
+        siw_dbg_cep(cep, "[QP %d]\n", params->qpn);
 
         if (try_gso && cep->mpa.hdr.params.bits & MPA_RR_FLAG_GSO_EXP) {
                 siw_dbg_cep(cep, "peer allows GSO on TX\n");
@@ -1611,8 +1610,8 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
             params->ird > sdev->attrs.max_ird) {
                 siw_dbg_cep(
                         cep,
-                        "id 0x%p, [QP %u]: ord %d (max %d), ird %d (max %d)\n",
-                        id, qp_id(qp), params->ord, sdev->attrs.max_ord,
+                        "[QP %u]: ord %d (max %d), ird %d (max %d)\n",
+                        qp_id(qp), params->ord, sdev->attrs.max_ord,
                         params->ird, sdev->attrs.max_ird);
                 rv = -EINVAL;
                 up_write(&qp->state_lock);
@@ -1624,8 +1623,8 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
         if (params->private_data_len > max_priv_data) {
                 siw_dbg_cep(
                         cep,
-                        "id 0x%p, [QP %u]: private data length: %d (max %d)\n",
-                        id, qp_id(qp), params->private_data_len, max_priv_data);
+                        "[QP %u]: private data length: %d (max %d)\n",
+                        qp_id(qp), params->private_data_len, max_priv_data);
                 rv = -EINVAL;
                 up_write(&qp->state_lock);
                 goto error;
@@ -1679,7 +1678,7 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
                 qp_attrs.flags = SIW_MPA_CRC;
         qp_attrs.state = SIW_QP_STATE_RTS;
 
-        siw_dbg_cep(cep, "id 0x%p, [QP%u]: moving to rts\n", id, qp_id(qp));
+        siw_dbg_cep(cep, "[QP%u]: moving to rts\n", qp_id(qp));
 
         /* Associate QP with CEP */
         siw_cep_get(cep);
@@ -1700,8 +1699,8 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
         if (rv)
                 goto error;
 
-        siw_dbg_cep(cep, "id 0x%p, [QP %u]: send mpa reply, %d byte pdata\n",
-                    id, qp_id(qp), params->private_data_len);
+        siw_dbg_cep(cep, "[QP %u]: send mpa reply, %d byte pdata\n",
+                    qp_id(qp), params->private_data_len);
 
         rv = siw_send_mpareqrep(cep, params->private_data,
                                 params->private_data_len);
@@ -1759,14 +1758,14 @@ int siw_reject(struct iw_cm_id *id, const void *pdata, u8 pd_len)
         siw_cancel_mpatimer(cep);
 
         if (cep->state != SIW_EPSTATE_RECVD_MPAREQ) {
-                siw_dbg_cep(cep, "id 0x%p: out of state\n", id);
+                siw_dbg_cep(cep, "out of state\n");
 
                 siw_cep_set_free(cep);
                 siw_cep_put(cep); /* put last reference */
 
                 return -ECONNRESET;
         }
-        siw_dbg_cep(cep, "id 0x%p, cep->state %d, pd_len %d\n", id, cep->state,
+        siw_dbg_cep(cep, "cep->state %d, pd_len %d\n", cep->state,
                     pd_len);
 
         if (__mpa_rr_revision(cep->mpa.hdr.params.bits) >= MPA_REVISION_1) {
@@ -1804,14 +1803,14 @@ static int siw_listen_address(struct iw_cm_id *id, int backlog,
         rv = kernel_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&s_val,
                                sizeof(s_val));
         if (rv) {
-                siw_dbg(id->device, "id 0x%p: setsockopt error: %d\n", id, rv);
+                siw_dbg(id->device, "setsockopt error: %d\n", rv);
                 goto error;
         }
         rv = s->ops->bind(s, laddr, addr_family == AF_INET ?
                                     sizeof(struct sockaddr_in) :
                                     sizeof(struct sockaddr_in6));
         if (rv) {
-                siw_dbg(id->device, "id 0x%p: socket bind error: %d\n", id, rv);
+                siw_dbg(id->device, "socket bind error: %d\n", rv);
                 goto error;
         }
         cep = siw_cep_alloc(sdev);
@@ -1824,13 +1823,13 @@ static int siw_listen_address(struct iw_cm_id *id, int backlog,
         rv = siw_cm_alloc_work(cep, backlog);
         if (rv) {
                 siw_dbg(id->device,
-                        "id 0x%p: alloc_work error %d, backlog %d\n", id,
+                        "alloc_work error %d, backlog %d\n",
                         rv, backlog);
                 goto error;
         }
         rv = s->ops->listen(s, backlog);
         if (rv) {
-                siw_dbg(id->device, "id 0x%p: listen error %d\n", id, rv);
+                siw_dbg(id->device, "listen error %d\n", rv);
                 goto error;
         }
         cep->cm_id = id;
@@ -1914,8 +1913,7 @@ static void siw_drop_listeners(struct iw_cm_id *id)
 
                 list_del(p);
 
-                siw_dbg_cep(cep, "id 0x%p: drop cep, state %d\n", id,
-                            cep->state);
+                siw_dbg_cep(cep, "drop cep, state %d\n", cep->state);
 
                 siw_cep_set_inuse(cep);
 
@@ -1952,7 +1950,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
         struct net_device *dev = to_siw_dev(id->device)->netdev;
         int rv = 0, listeners = 0;
 
-        siw_dbg(id->device, "id 0x%p: backlog %d\n", id, backlog);
+        siw_dbg(id->device, "backlog %d\n", backlog);
 
         /*
          * For each attached address of the interface, create a
@@ -1964,12 +1962,16 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
                 struct sockaddr_in s_laddr, *s_raddr;
                 const struct in_ifaddr *ifa;
 
+                if (!in_dev) {
+                        rv = -ENODEV;
+                        goto out;
+                }
                 memcpy(&s_laddr, &id->local_addr, sizeof(s_laddr));
                 s_raddr = (struct sockaddr_in *)&id->remote_addr;
 
                 siw_dbg(id->device,
-                        "id 0x%p: laddr %pI4:%d, raddr %pI4:%d\n",
-                        id, &s_laddr.sin_addr, ntohs(s_laddr.sin_port),
+                        "laddr %pI4:%d, raddr %pI4:%d\n",
+                        &s_laddr.sin_addr, ntohs(s_laddr.sin_port),
                         &s_raddr->sin_addr, ntohs(s_raddr->sin_port));
 
                 rtnl_lock();
@@ -1993,22 +1995,27 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
                 struct sockaddr_in6 *s_laddr = &to_sockaddr_in6(id->local_addr),
                         *s_raddr = &to_sockaddr_in6(id->remote_addr);
 
+                if (!in6_dev) {
+                        rv = -ENODEV;
+                        goto out;
+                }
                 siw_dbg(id->device,
-                        "id 0x%p: laddr %pI6:%d, raddr %pI6:%d\n",
-                        id, &s_laddr->sin6_addr, ntohs(s_laddr->sin6_port),
+                        "laddr %pI6:%d, raddr %pI6:%d\n",
+                        &s_laddr->sin6_addr, ntohs(s_laddr->sin6_port),
                         &s_raddr->sin6_addr, ntohs(s_raddr->sin6_port));
 
-                read_lock_bh(&in6_dev->lock);
+                rtnl_lock();
                 list_for_each_entry(ifp, &in6_dev->addr_list, if_list) {
-                        struct sockaddr_in6 bind_addr;
-
+                        if (ifp->flags & (IFA_F_TENTATIVE | IFA_F_DEPRECATED))
+                                continue;
                         if (ipv6_addr_any(&s_laddr->sin6_addr) ||
                             ipv6_addr_equal(&s_laddr->sin6_addr, &ifp->addr)) {
-                                bind_addr.sin6_family = AF_INET6;
-                                bind_addr.sin6_port = s_laddr->sin6_port;
-                                bind_addr.sin6_flowinfo = 0;
-                                bind_addr.sin6_addr = ifp->addr;
-                                bind_addr.sin6_scope_id = dev->ifindex;
+                                struct sockaddr_in6 bind_addr  = {
+                                        .sin6_family = AF_INET6,
+                                        .sin6_port = s_laddr->sin6_port,
+                                        .sin6_flowinfo = 0,
+                                        .sin6_addr = ifp->addr,
+                                        .sin6_scope_id = dev->ifindex };
 
                                 rv = siw_listen_address(id, backlog,
                                                 (struct sockaddr *)&bind_addr,
@@ -2017,28 +2024,26 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
                                         listeners++;
                         }
                 }
-                read_unlock_bh(&in6_dev->lock);
-
+                rtnl_unlock();
                 in6_dev_put(in6_dev);
         } else {
-                return -EAFNOSUPPORT;
+                rv = -EAFNOSUPPORT;
         }
+out:
         if (listeners)
                 rv = 0;
         else if (!rv)
                 rv = -EINVAL;
 
-        siw_dbg(id->device, "id 0x%p: %s\n", id, rv ? "FAIL" : "OK");
+        siw_dbg(id->device, "%s\n", rv ? "FAIL" : "OK");
 
         return rv;
 }
 
 int siw_destroy_listen(struct iw_cm_id *id)
 {
-        siw_dbg(id->device, "id 0x%p\n", id);
-
         if (!id->provider_data) {
-                siw_dbg(id->device, "id 0x%p: no cep(s)\n", id);
+                siw_dbg(id->device, "no cep(s)\n");
                 return 0;
         }
         siw_drop_listeners(id);
diff --git a/drivers/infiniband/sw/siw/siw_cq.c b/drivers/infiniband/sw/siw/siw_cq.c
index e381ae9b7d62..d8db3bee9da7 100644
--- a/drivers/infiniband/sw/siw/siw_cq.c
+++ b/drivers/infiniband/sw/siw/siw_cq.c
@@ -71,9 +71,10 @@ int siw_reap_cqe(struct siw_cq *cq, struct ib_wc *wc)
                                 wc->wc_flags = IB_WC_WITH_INVALIDATE;
                         }
                         wc->qp = cqe->base_qp;
-                        siw_dbg_cq(cq, "idx %u, type %d, flags %2x, id 0x%p\n",
+                        siw_dbg_cq(cq,
+                                   "idx %u, type %d, flags %2x, id 0x%pK\n",
                                    cq->cq_get % cq->num_cqe, cqe->opcode,
-                                   cqe->flags, (void *)cqe->id);
+                                   cqe->flags, (void *)(uintptr_t)cqe->id);
                 }
                 WRITE_ONCE(cqe->flags, 0);
                 cq->cq_get++;
diff --git a/drivers/infiniband/sw/siw/siw_mem.c b/drivers/infiniband/sw/siw/siw_mem.c
index 67171c82b0c4..87a56039f0ef 100644
--- a/drivers/infiniband/sw/siw/siw_mem.c
+++ b/drivers/infiniband/sw/siw/siw_mem.c
@@ -197,12 +197,12 @@ int siw_check_mem(struct ib_pd *pd, struct siw_mem *mem, u64 addr,
          */
         if (addr < mem->va || addr + len > mem->va + mem->len) {
                 siw_dbg_pd(pd, "MEM interval len %d\n", len);
-                siw_dbg_pd(pd, "[0x%016llx, 0x%016llx] out of bounds\n",
-                           (unsigned long long)addr,
-                           (unsigned long long)(addr + len));
-                siw_dbg_pd(pd, "[0x%016llx, 0x%016llx] STag=0x%08x\n",
-                           (unsigned long long)mem->va,
-                           (unsigned long long)(mem->va + mem->len),
+                siw_dbg_pd(pd, "[0x%pK, 0x%pK] out of bounds\n",
+                           (void *)(uintptr_t)addr,
+                           (void *)(uintptr_t)(addr + len));
+                siw_dbg_pd(pd, "[0x%pK, 0x%pK] STag=0x%08x\n",
+                           (void *)(uintptr_t)mem->va,
+                           (void *)(uintptr_t)(mem->va + mem->len),
                            mem->stag);
 
                 return -E_BASE_BOUNDS;
@@ -330,7 +330,7 @@ out:
  * Optionally, provides remaining len within current element, and
  * current PBL index for later resume at same element.
  */
-u64 siw_pbl_get_buffer(struct siw_pbl *pbl, u64 off, int *len, int *idx)
+dma_addr_t siw_pbl_get_buffer(struct siw_pbl *pbl, u64 off, int *len, int *idx)
 {
         int i = idx ? *idx : 0;
 
diff --git a/drivers/infiniband/sw/siw/siw_mem.h b/drivers/infiniband/sw/siw/siw_mem.h
index f43daf280891..db138c8423da 100644
--- a/drivers/infiniband/sw/siw/siw_mem.h
+++ b/drivers/infiniband/sw/siw/siw_mem.h
@@ -9,7 +9,7 @@
 struct siw_umem *siw_umem_get(u64 start, u64 len, bool writable);
 void siw_umem_release(struct siw_umem *umem, bool dirty);
 struct siw_pbl *siw_pbl_alloc(u32 num_buf);
-u64 siw_pbl_get_buffer(struct siw_pbl *pbl, u64 off, int *len, int *idx);
+dma_addr_t siw_pbl_get_buffer(struct siw_pbl *pbl, u64 off, int *len, int *idx);
 struct siw_mem *siw_mem_id2obj(struct siw_device *sdev, int stag_index);
 int siw_mem_add(struct siw_device *sdev, struct siw_mem *m);
 int siw_invalidate_stag(struct ib_pd *pd, u32 stag);
diff --git a/drivers/infiniband/sw/siw/siw_qp.c b/drivers/infiniband/sw/siw/siw_qp.c
index 0990307c5d2c..430314c8abd9 100644
--- a/drivers/infiniband/sw/siw/siw_qp.c
+++ b/drivers/infiniband/sw/siw/siw_qp.c
@@ -949,7 +949,7 @@ skip_irq:
                                 rv = -EINVAL;
                                 goto out;
                         }
-                        wqe->sqe.sge[0].laddr = (u64)&wqe->sqe.sge[1];
+                        wqe->sqe.sge[0].laddr = (uintptr_t)&wqe->sqe.sge[1];
                         wqe->sqe.sge[0].lkey = 0;
                         wqe->sqe.num_sge = 1;
                 }
diff --git a/drivers/infiniband/sw/siw/siw_qp_rx.c b/drivers/infiniband/sw/siw/siw_qp_rx.c
index f87657a11657..c0a887240325 100644
--- a/drivers/infiniband/sw/siw/siw_qp_rx.c
+++ b/drivers/infiniband/sw/siw/siw_qp_rx.c
@@ -38,9 +38,10 @@ static int siw_rx_umem(struct siw_rx_stream *srx, struct siw_umem *umem,
 
                 p = siw_get_upage(umem, dest_addr);
                 if (unlikely(!p)) {
-                        pr_warn("siw: %s: [QP %u]: bogus addr: %p, %p\n",
+                        pr_warn("siw: %s: [QP %u]: bogus addr: %pK, %pK\n",
                                 __func__, qp_id(rx_qp(srx)),
-                                (void *)dest_addr, (void *)umem->fp_addr);
+                                (void *)(uintptr_t)dest_addr,
+                                (void *)(uintptr_t)umem->fp_addr);
                         /* siw internal error */
                         srx->skb_copied += copied;
                         srx->skb_new -= copied;
@@ -50,7 +51,7 @@ static int siw_rx_umem(struct siw_rx_stream *srx, struct siw_umem *umem,
                 pg_off = dest_addr & ~PAGE_MASK;
                 bytes = min(len, (int)PAGE_SIZE - pg_off);
 
-                siw_dbg_qp(rx_qp(srx), "page %p, bytes=%u\n", p, bytes);
+                siw_dbg_qp(rx_qp(srx), "page %pK, bytes=%u\n", p, bytes);
 
                 dest = kmap_atomic(p);
                 rv = skb_copy_bits(srx->skb, srx->skb_offset, dest + pg_off,
@@ -104,11 +105,11 @@ static int siw_rx_kva(struct siw_rx_stream *srx, void *kva, int len)
 {
         int rv;
 
-        siw_dbg_qp(rx_qp(srx), "kva: 0x%p, len: %u\n", kva, len);
+        siw_dbg_qp(rx_qp(srx), "kva: 0x%pK, len: %u\n", kva, len);
 
         rv = skb_copy_bits(srx->skb, srx->skb_offset, kva, len);
         if (unlikely(rv)) {
-                pr_warn("siw: [QP %u]: %s, len %d, kva 0x%p, rv %d\n",
+                pr_warn("siw: [QP %u]: %s, len %d, kva 0x%pK, rv %d\n",
                         qp_id(rx_qp(srx)), __func__, len, kva, rv);
 
                 return rv;
@@ -132,7 +133,7 @@ static int siw_rx_pbl(struct siw_rx_stream *srx, int *pbl_idx,
 
         while (len) {
                 int bytes;
-                u64 buf_addr =
+                dma_addr_t buf_addr =
                         siw_pbl_get_buffer(pbl, offset, &bytes, pbl_idx);
                 if (!buf_addr)
                         break;
@@ -485,8 +486,8 @@ int siw_proc_send(struct siw_qp *qp)
                 mem_p = *mem;
                 if (mem_p->mem_obj == NULL)
                         rv = siw_rx_kva(srx,
-                                        (void *)(sge->laddr + frx->sge_off),
-                                        sge_bytes);
+                                (void *)(uintptr_t)(sge->laddr + frx->sge_off),
+                                sge_bytes);
                 else if (!mem_p->is_pbl)
                         rv = siw_rx_umem(srx, mem_p->umem,
                                          sge->laddr + frx->sge_off, sge_bytes);
@@ -598,8 +599,8 @@ int siw_proc_write(struct siw_qp *qp)
 
         if (mem->mem_obj == NULL)
                 rv = siw_rx_kva(srx,
-                                (void *)(srx->ddp_to + srx->fpdu_part_rcvd),
-                                bytes);
+                        (void *)(uintptr_t)(srx->ddp_to + srx->fpdu_part_rcvd),
+                        bytes);
         else if (!mem->is_pbl)
                 rv = siw_rx_umem(srx, mem->umem,
                                  srx->ddp_to + srx->fpdu_part_rcvd, bytes);
@@ -841,8 +842,9 @@ int siw_proc_rresp(struct siw_qp *qp)
         bytes = min(srx->fpdu_part_rem, srx->skb_new);
 
         if (mem_p->mem_obj == NULL)
-                rv = siw_rx_kva(srx, (void *)(sge->laddr + wqe->processed),
-                                bytes);
+                rv = siw_rx_kva(srx,
+                        (void *)(uintptr_t)(sge->laddr + wqe->processed),
+                        bytes);
         else if (!mem_p->is_pbl)
                 rv = siw_rx_umem(srx, mem_p->umem, sge->laddr + wqe->processed,
                                  bytes);
diff --git a/drivers/infiniband/sw/siw/siw_qp_tx.c b/drivers/infiniband/sw/siw/siw_qp_tx.c
index 43020d2040fc..438a2917a47c 100644
--- a/drivers/infiniband/sw/siw/siw_qp_tx.c
+++ b/drivers/infiniband/sw/siw/siw_qp_tx.c
@@ -26,7 +26,7 @@ static struct page *siw_get_pblpage(struct siw_mem *mem, u64 addr, int *idx)
 {
         struct siw_pbl *pbl = mem->pbl;
         u64 offset = addr - mem->va;
-        u64 paddr = siw_pbl_get_buffer(pbl, offset, NULL, idx);
+        dma_addr_t paddr = siw_pbl_get_buffer(pbl, offset, NULL, idx);
 
         if (paddr)
                 return virt_to_page(paddr);
@@ -37,7 +37,7 @@ static struct page *siw_get_pblpage(struct siw_mem *mem, u64 addr, int *idx)
 /*
  * Copy short payload at provided destination payload address
  */
-static int siw_try_1seg(struct siw_iwarp_tx *c_tx, u64 paddr)
+static int siw_try_1seg(struct siw_iwarp_tx *c_tx, void *paddr)
 {
         struct siw_wqe *wqe = &c_tx->wqe_active;
         struct siw_sge *sge = &wqe->sqe.sge[0];
@@ -50,16 +50,16 @@ static int siw_try_1seg(struct siw_iwarp_tx *c_tx, u64 paddr)
                 return 0;
 
         if (tx_flags(wqe) & SIW_WQE_INLINE) {
-                memcpy((void *)paddr, &wqe->sqe.sge[1], bytes);
+                memcpy(paddr, &wqe->sqe.sge[1], bytes);
         } else {
                 struct siw_mem *mem = wqe->mem[0];
 
                 if (!mem->mem_obj) {
                         /* Kernel client using kva */
-                        memcpy((void *)paddr, (void *)sge->laddr, bytes);
+                        memcpy(paddr,
+                               (const void *)(uintptr_t)sge->laddr, bytes);
                 } else if (c_tx->in_syscall) {
-                        if (copy_from_user((void *)paddr,
-                                           (const void __user *)sge->laddr,
+                        if (copy_from_user(paddr, u64_to_user_ptr(sge->laddr),
                                            bytes))
                                 return -EFAULT;
                 } else {
@@ -79,12 +79,12 @@ static int siw_try_1seg(struct siw_iwarp_tx *c_tx, u64 paddr)
                         buffer = kmap_atomic(p);
 
                         if (likely(PAGE_SIZE - off >= bytes)) {
-                                memcpy((void *)paddr, buffer + off, bytes);
+                                memcpy(paddr, buffer + off, bytes);
                                 kunmap_atomic(buffer);
                         } else {
                                 unsigned long part = bytes - (PAGE_SIZE - off);
 
-                                memcpy((void *)paddr, buffer + off, part);
+                                memcpy(paddr, buffer + off, part);
                                 kunmap_atomic(buffer);
 
                                 if (!mem->is_pbl)
@@ -98,7 +98,7 @@ static int siw_try_1seg(struct siw_iwarp_tx *c_tx, u64 paddr)
                                         return -EFAULT;
 
                                 buffer = kmap_atomic(p);
-                                memcpy((void *)(paddr + part), buffer,
+                                memcpy(paddr + part, buffer,
                                        bytes - part);
                                 kunmap_atomic(buffer);
                         }
@@ -166,7 +166,7 @@ static int siw_qp_prepare_tx(struct siw_iwarp_tx *c_tx)
                 c_tx->ctrl_len = sizeof(struct iwarp_send);
 
                 crc = (char *)&c_tx->pkt.send_pkt.crc;
-                data = siw_try_1seg(c_tx, (u64)crc);
+                data = siw_try_1seg(c_tx, crc);
                 break;
 
         case SIW_OP_SEND_REMOTE_INV:
@@ -189,7 +189,7 @@ static int siw_qp_prepare_tx(struct siw_iwarp_tx *c_tx)
                 c_tx->ctrl_len = sizeof(struct iwarp_send_inv);
 
                 crc = (char *)&c_tx->pkt.send_pkt.crc;
-                data = siw_try_1seg(c_tx, (u64)crc);
+                data = siw_try_1seg(c_tx, crc);
                 break;
 
         case SIW_OP_WRITE:
@@ -201,7 +201,7 @@ static int siw_qp_prepare_tx(struct siw_iwarp_tx *c_tx)
                 c_tx->ctrl_len = sizeof(struct iwarp_rdma_write);
 
                 crc = (char *)&c_tx->pkt.write_pkt.crc;
-                data = siw_try_1seg(c_tx, (u64)crc);
+                data = siw_try_1seg(c_tx, crc);
                 break;
 
         case SIW_OP_READ_RESPONSE:
@@ -216,7 +216,7 @@ static int siw_qp_prepare_tx(struct siw_iwarp_tx *c_tx)
                 c_tx->ctrl_len = sizeof(struct iwarp_rdma_rresp);
 
                 crc = (char *)&c_tx->pkt.write_pkt.crc;
-                data = siw_try_1seg(c_tx, (u64)crc);
+                data = siw_try_1seg(c_tx, crc);
                 break;
 
         default:
@@ -398,15 +398,13 @@ static int siw_0copy_tx(struct socket *s, struct page **page,
 
 #define MAX_TRAILER (MPA_CRC_SIZE + 4)
 
-static void siw_unmap_pages(struct page **pages, int hdr_len, int num_maps)
+static void siw_unmap_pages(struct page **pp, unsigned long kmap_mask)
 {
-        if (hdr_len) {
-                ++pages;
-                --num_maps;
-        }
-        while (num_maps-- > 0) {
-                kunmap(*pages);
-                pages++;
+        while (kmap_mask) {
+                if (kmap_mask & BIT(0))
+                        kunmap(*pp);
+                pp++;
+                kmap_mask >>= 1;
         }
 }
 
@@ -437,6 +435,7 @@ static int siw_tx_hdt(struct siw_iwarp_tx *c_tx, struct socket *s)
         unsigned int data_len = c_tx->bytes_unsent, hdr_len = 0, trl_len = 0,
                      sge_off = c_tx->sge_off, sge_idx = c_tx->sge_idx,
                      pbl_idx = c_tx->pbl_idx;
+        unsigned long kmap_mask = 0L;
 
         if (c_tx->state == SIW_SEND_HDR) {
                 if (c_tx->use_sendpage) {
@@ -463,8 +462,7 @@ static int siw_tx_hdt(struct siw_iwarp_tx *c_tx, struct socket *s)
 
                 if (!(tx_flags(wqe) & SIW_WQE_INLINE)) {
                         mem = wqe->mem[sge_idx];
-                        if (!mem->mem_obj)
-                                is_kva = 1;
+                        is_kva = mem->mem_obj == NULL ? 1 : 0;
                 } else {
                         is_kva = 1;
                 }
@@ -473,7 +471,8 @@ static int siw_tx_hdt(struct siw_iwarp_tx *c_tx, struct socket *s)
                          * tx from kernel virtual address: either inline data
                          * or memory region with assigned kernel buffer
                          */
-                        iov[seg].iov_base = (void *)(sge->laddr + sge_off);
+                        iov[seg].iov_base =
+                                (void *)(uintptr_t)(sge->laddr + sge_off);
                         iov[seg].iov_len = sge_len;
 
                         if (do_crc)
@@ -500,12 +499,7 @@ static int siw_tx_hdt(struct siw_iwarp_tx *c_tx, struct socket *s)
                                         p = siw_get_upage(mem->umem,
                                                           sge->laddr + sge_off);
                                 if (unlikely(!p)) {
-                                        if (hdr_len)
-                                                seg--;
-                                        if (!c_tx->use_sendpage && seg) {
-                                                siw_unmap_pages(page_array,
-                                                                hdr_len, seg);
-                                        }
+                                        siw_unmap_pages(page_array, kmap_mask);
                                         wqe->processed -= c_tx->bytes_unsent;
                                         rv = -EFAULT;
                                         goto done_crc;
@@ -515,6 +509,10 @@ static int siw_tx_hdt(struct siw_iwarp_tx *c_tx, struct socket *s)
                                 if (!c_tx->use_sendpage) {
                                         iov[seg].iov_base = kmap(p) + fp_off;
                                         iov[seg].iov_len = plen;
+
+                                        /* Remember for later kunmap() */
+                                        kmap_mask |= BIT(seg);
+
                                         if (do_crc)
                                                 crypto_shash_update(
                                                         c_tx->mpa_crc_hd,
@@ -526,13 +524,13 @@ static int siw_tx_hdt(struct siw_iwarp_tx *c_tx, struct socket *s)
                                                 page_address(p) + fp_off,
                                                 plen);
                         } else {
-                                u64 pa = ((sge->laddr + sge_off) & PAGE_MASK);
+                                u64 va = sge->laddr + sge_off;
 
-                                page_array[seg] = virt_to_page(pa);
+                                page_array[seg] = virt_to_page(va & PAGE_MASK);
                                 if (do_crc)
                                         crypto_shash_update(
                                                 c_tx->mpa_crc_hd,
-                                                (void *)(sge->laddr + sge_off),
+                                                (void *)(uintptr_t)va,
                                                 plen);
                         }
 
@@ -543,10 +541,7 @@ static int siw_tx_hdt(struct siw_iwarp_tx *c_tx, struct socket *s)
 
                         if (++seg > (int)MAX_ARRAY) {
                                 siw_dbg_qp(tx_qp(c_tx), "to many fragments\n");
-                                if (!is_kva && !c_tx->use_sendpage) {
-                                        siw_unmap_pages(page_array, hdr_len,
-                                                        seg - 1);
-                                }
+                                siw_unmap_pages(page_array, kmap_mask);
                                 wqe->processed -= c_tx->bytes_unsent;
                                 rv = -EMSGSIZE;
                                 goto done_crc;
@@ -597,8 +592,7 @@ sge_done:
         } else {
                 rv = kernel_sendmsg(s, &msg, iov, seg + 1,
                                     hdr_len + data_len + trl_len);
-                if (!is_kva)
-                        siw_unmap_pages(page_array, hdr_len, seg);
+                siw_unmap_pages(page_array, kmap_mask);
         }
         if (rv < (int)hdr_len) {
                 /* Not even complete hdr pushed or negative rv */
@@ -829,7 +823,8 @@ static int siw_qp_sq_proc_tx(struct siw_qp *qp, struct siw_wqe *wqe)
                                         rv = -EINVAL;
                                         goto tx_error;
                                 }
-                                wqe->sqe.sge[0].laddr = (u64)&wqe->sqe.sge[1];
+                                wqe->sqe.sge[0].laddr =
+                                        (u64)(uintptr_t)&wqe->sqe.sge[1];
                         }
                 }
                 wqe->wr_status = SIW_WR_INPROGRESS;
@@ -924,7 +919,7 @@ tx_error:
 
 static int siw_fastreg_mr(struct ib_pd *pd, struct siw_sqe *sqe)
 {
-        struct ib_mr *base_mr = (struct ib_mr *)sqe->base_mr;
+        struct ib_mr *base_mr = (struct ib_mr *)(uintptr_t)sqe->base_mr;
         struct siw_device *sdev = to_siw_dev(pd->device);
         struct siw_mem *mem = siw_mem_id2obj(sdev, sqe->rkey  >> 8);
         int rv = 0;
@@ -954,8 +949,7 @@ static int siw_fastreg_mr(struct ib_pd *pd, struct siw_sqe *sqe)
         mem->stag = sqe->rkey;
         mem->perms = sqe->access;
 
-        siw_dbg_mem(mem, "STag now valid, MR va: 0x%016llx -> 0x%016llx\n",
-                    mem->va, base_mr->iova);
+        siw_dbg_mem(mem, "STag 0x%08x now valid\n", sqe->rkey);
         mem->va = base_mr->iova;
         mem->stag_valid = 1;
 out:
diff --git a/drivers/infiniband/sw/siw/siw_verbs.c b/drivers/infiniband/sw/siw/siw_verbs.c
index e7f3a2379d9d..da52c90e06d4 100644
--- a/drivers/infiniband/sw/siw/siw_verbs.c
+++ b/drivers/infiniband/sw/siw/siw_verbs.c
@@ -424,8 +424,7 @@ struct ib_qp *siw_create_qp(struct ib_pd *pd,
                  */
                 qp->srq = to_siw_srq(attrs->srq);
                 qp->attrs.rq_size = 0;
-                siw_dbg(base_dev, "QP [%u]: [SRQ 0x%p] attached\n",
-                        qp->qp_num, qp->srq);
+                siw_dbg(base_dev, "QP [%u]: SRQ attached\n", qp->qp_num);
         } else if (num_rqe) {
                 if (qp->kernel_verbs)
                         qp->recvq = vzalloc(num_rqe * sizeof(struct siw_rqe));
@@ -610,7 +609,7 @@ int siw_destroy_qp(struct ib_qp *base_qp, struct ib_udata *udata)
                                           base_ucontext);
         struct siw_qp_attrs qp_attrs;
 
-        siw_dbg_qp(qp, "state %d, cep 0x%p\n", qp->attrs.state, qp->cep);
+        siw_dbg_qp(qp, "state %d\n", qp->attrs.state);
 
         /*
          * Mark QP as in process of destruction to prevent from
@@ -662,7 +661,7 @@ static int siw_copy_inline_sgl(const struct ib_send_wr *core_wr,
         void *kbuf = &sqe->sge[1];
         int num_sge = core_wr->num_sge, bytes = 0;
 
-        sqe->sge[0].laddr = (u64)kbuf;
+        sqe->sge[0].laddr = (uintptr_t)kbuf;
         sqe->sge[0].lkey = 0;
 
         while (num_sge--) {
@@ -825,7 +824,7 @@ int siw_post_send(struct ib_qp *base_qp, const struct ib_send_wr *wr,
                         break;
 
                 case IB_WR_REG_MR:
-                        sqe->base_mr = (uint64_t)reg_wr(wr)->mr;
+                        sqe->base_mr = (uintptr_t)reg_wr(wr)->mr;
                         sqe->rkey = reg_wr(wr)->key;
                         sqe->access = reg_wr(wr)->access & IWARP_ACCESS_MASK;
                         sqe->opcode = SIW_OP_REG_MR;
@@ -842,8 +841,9 @@ int siw_post_send(struct ib_qp *base_qp, const struct ib_send_wr *wr,
                         rv = -EINVAL;
                         break;
                 }
-                siw_dbg_qp(qp, "opcode %d, flags 0x%x, wr_id 0x%p\n",
-                           sqe->opcode, sqe->flags, (void *)sqe->id);
+                siw_dbg_qp(qp, "opcode %d, flags 0x%x, wr_id 0x%pK\n",
+                           sqe->opcode, sqe->flags,
+                           (void *)(uintptr_t)sqe->id);
 
                 if (unlikely(rv < 0))
                         break;
@@ -1205,8 +1205,8 @@ struct ib_mr *siw_reg_user_mr(struct ib_pd *pd, u64 start, u64 len,
         unsigned long mem_limit = rlimit(RLIMIT_MEMLOCK);
         int rv;
 
-        siw_dbg_pd(pd, "start: 0x%016llx, va: 0x%016llx, len: %llu\n",
-                   (unsigned long long)start, (unsigned long long)rnic_va,
+        siw_dbg_pd(pd, "start: 0x%pK, va: 0x%pK, len: %llu\n",
+                   (void *)(uintptr_t)start, (void *)(uintptr_t)rnic_va,
                    (unsigned long long)len);
 
         if (atomic_inc_return(&sdev->num_mr) > SIW_MAX_MR) {
@@ -1363,7 +1363,7 @@ int siw_map_mr_sg(struct ib_mr *base_mr, struct scatterlist *sl, int num_sle,
         struct siw_mem *mem = mr->mem;
         struct siw_pbl *pbl = mem->pbl;
         struct siw_pble *pble;
-        u64 pbl_size;
+        unsigned long pbl_size;
         int i, rv;
 
         if (!pbl) {
@@ -1402,16 +1402,18 @@ int siw_map_mr_sg(struct ib_mr *base_mr, struct scatterlist *sl, int num_sle,
                         pbl_size += sg_dma_len(slp);
                 }
                 siw_dbg_mem(mem,
-                        "sge[%d], size %llu, addr 0x%016llx, total %llu\n",
-                        i, pble->size, pble->addr, pbl_size);
+                        "sge[%d], size %u, addr 0x%p, total %lu\n",
+                        i, pble->size, (void *)(uintptr_t)pble->addr,
+                        pbl_size);
         }
         rv = ib_sg_to_pages(base_mr, sl, num_sle, sg_off, siw_set_pbl_page);
         if (rv > 0) {
                 mem->len = base_mr->length;
                 mem->va = base_mr->iova;
                 siw_dbg_mem(mem,
-                        "%llu bytes, start 0x%016llx, %u SLE to %u entries\n",
-                        mem->len, mem->va, num_sle, pbl->num_buf);
+                        "%llu bytes, start 0x%pK, %u SLE to %u entries\n",
+                        mem->len, (void *)(uintptr_t)mem->va, num_sle,
+                        pbl->num_buf);
         }
         return rv;
 }
@@ -1529,7 +1531,7 @@ int siw_create_srq(struct ib_srq *base_srq,
         }
         spin_lock_init(&srq->lock);
 
-        siw_dbg_pd(base_srq->pd, "[SRQ 0x%p]: success\n", srq);
+        siw_dbg_pd(base_srq->pd, "[SRQ]: success\n");
 
         return 0;
 
@@ -1650,8 +1652,7 @@ int siw_post_srq_recv(struct ib_srq *base_srq, const struct ib_recv_wr *wr,
 
         if (unlikely(!srq->kernel_verbs)) {
                 siw_dbg_pd(base_srq->pd,
-                           "[SRQ 0x%p]: no kernel post_recv for mapped srq\n",
-                           srq);
+                           "[SRQ]: no kernel post_recv for mapped srq\n");
                 rv = -EINVAL;
                 goto out;
         }
@@ -1673,8 +1674,7 @@ int siw_post_srq_recv(struct ib_srq *base_srq, const struct ib_recv_wr *wr,
                 }
                 if (unlikely(wr->num_sge > srq->max_sge)) {
                         siw_dbg_pd(base_srq->pd,
-                                   "[SRQ 0x%p]: too many sge's: %d\n", srq,
-                                   wr->num_sge);
+                                   "[SRQ]: too many sge's: %d\n", wr->num_sge);
                         rv = -EINVAL;
                         break;
                 }
@@ -1693,7 +1693,7 @@ int siw_post_srq_recv(struct ib_srq *base_srq, const struct ib_recv_wr *wr,
         spin_unlock_irqrestore(&srq->lock, flags);
 out:
         if (unlikely(rv < 0)) {
-                siw_dbg_pd(base_srq->pd, "[SRQ 0x%p]: error %d\n", srq, rv);
+                siw_dbg_pd(base_srq->pd, "[SRQ]: error %d\n", rv);
                 *bad_wr = wr;
         }
         return rv;
diff --git a/drivers/input/serio/hyperv-keyboard.c b/drivers/input/serio/hyperv-keyboard.c
index 88ae7c2ac3c8..e486a8a74c40 100644
--- a/drivers/input/serio/hyperv-keyboard.c
+++ b/drivers/input/serio/hyperv-keyboard.c
@@ -237,40 +237,17 @@ static void hv_kbd_handle_received_packet(struct hv_device *hv_dev,
 
 static void hv_kbd_on_channel_callback(void *context)
 {
+        struct vmpacket_descriptor *desc;
         struct hv_device *hv_dev = context;
-        void *buffer;
-        int bufferlen = 0x100; /* Start with sensible size */
         u32 bytes_recvd;
         u64 req_id;
-        int error;
 
-        buffer = kmalloc(bufferlen, GFP_ATOMIC);
-        if (!buffer)
-                return;
-
-        while (1) {
-                error = vmbus_recvpacket_raw(hv_dev->channel, buffer, bufferlen,
-                                             &bytes_recvd, &req_id);
-                switch (error) {
-                case 0:
-                        if (bytes_recvd == 0) {
-                                kfree(buffer);
-                                return;
-                        }
-
-                        hv_kbd_handle_received_packet(hv_dev, buffer,
-                                                      bytes_recvd, req_id);
-                        break;
+        foreach_vmbus_pkt(desc, hv_dev->channel) {
+                bytes_recvd = desc->len8 * 8;
+                req_id = desc->trans_id;
 
-                case -ENOBUFS:
-                        kfree(buffer);
-                        /* Handle large packet */
-                        bufferlen = bytes_recvd;
-                        buffer = kmalloc(bytes_recvd, GFP_ATOMIC);
-                        if (!buffer)
-                                return;
-                        break;
-                }
+                hv_kbd_handle_received_packet(hv_dev, desc, bytes_recvd,
+                                              req_id);
         }
 }
 
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index e15cdcd8cb3c..a4ddeade8ac4 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -182,6 +182,7 @@ config INTEL_IOMMU
         select IOMMU_IOVA
         select NEED_DMA_MAP_STATE
         select DMAR_TABLE
+        select SWIOTLB
         help
           DMA remapping (DMAR) devices support enables independent address
           translations for Direct Memory Access (DMA) from devices.
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
index a2729aadd300..4f405f926e73 100644
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@ -10,13 +10,14 @@ obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE) += io-pgtable-arm.o
 obj-$(CONFIG_IOMMU_IOVA) += iova.o
 obj-$(CONFIG_OF_IOMMU)  += of_iommu.o
 obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o
-obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o
+obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o amd_iommu_quirks.o
 obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd_iommu_debugfs.o
 obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o
 obj-$(CONFIG_ARM_SMMU) += arm-smmu.o arm-smmu-impl.o
 obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o
 obj-$(CONFIG_DMAR_TABLE) += dmar.o
 obj-$(CONFIG_INTEL_IOMMU) += intel-iommu.o intel-pasid.o
+obj-$(CONFIG_INTEL_IOMMU) += intel-trace.o
 obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += intel-iommu-debugfs.o
 obj-$(CONFIG_INTEL_IOMMU_SVM) += intel-svm.o
 obj-$(CONFIG_IPMMU_VMSA) += ipmmu-vmsa.o
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 29eeea914660..1ed3b98324ba 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -436,7 +436,7 @@ static int iommu_init_device(struct device *dev)
          * invalid address), we ignore the capability for the device so
          * it'll be forced to go into translation mode.
          */
-        if ((iommu_pass_through || !amd_iommu_force_isolation) &&
+        if ((iommu_default_passthrough() || !amd_iommu_force_isolation) &&
             dev_is_pci(dev) && pci_iommuv2_capable(to_pci_dev(dev))) {
                 struct amd_iommu *iommu;
 
@@ -1143,6 +1143,17 @@ static void amd_iommu_flush_tlb_all(struct amd_iommu *iommu)
         iommu_completion_wait(iommu);
 }
 
+static void amd_iommu_flush_tlb_domid(struct amd_iommu *iommu, u32 dom_id)
+{
+        struct iommu_cmd cmd;
+
+        build_inv_iommu_pages(&cmd, 0, CMD_INV_IOMMU_ALL_PAGES_ADDRESS,
+                              dom_id, 1);
+        iommu_queue_command(iommu, &cmd);
+
+        iommu_completion_wait(iommu);
+}
+
 static void amd_iommu_flush_all(struct amd_iommu *iommu)
 {
         struct iommu_cmd cmd;
@@ -1424,18 +1435,21 @@ static void free_pagetable(struct protection_domain *domain)
  * another level increases the size of the address space by 9 bits to a size up
  * to 64 bits.
  */
-static bool increase_address_space(struct protection_domain *domain,
+static void increase_address_space(struct protection_domain *domain,
                                    gfp_t gfp)
 {
+        unsigned long flags;
         u64 *pte;
 
-        if (domain->mode == PAGE_MODE_6_LEVEL)
+        spin_lock_irqsave(&domain->lock, flags);
+
+        if (WARN_ON_ONCE(domain->mode == PAGE_MODE_6_LEVEL))
                 /* address space already 64 bit large */
-                return false;
+                goto out;
 
         pte = (void *)get_zeroed_page(gfp);
         if (!pte)
-                return false;
+                goto out;
 
         *pte             = PM_LEVEL_PDE(domain->mode,
                                         iommu_virt_to_phys(domain->pt_root));
@@ -1443,7 +1457,10 @@ static bool increase_address_space(struct protection_domain *domain,
         domain->mode    += 1;
         domain->updated  = true;
 
-        return true;
+out:
+        spin_unlock_irqrestore(&domain->lock, flags);
+
+        return;
 }
 
 static u64 *alloc_pte(struct protection_domain *domain,
@@ -1873,6 +1890,7 @@ static void set_dte_entry(u16 devid, struct protection_domain *domain,
 {
         u64 pte_root = 0;
         u64 flags = 0;
+        u32 old_domid;
 
         if (domain->mode != PAGE_MODE_NONE)
                 pte_root = iommu_virt_to_phys(domain->pt_root);
@@ -1922,8 +1940,20 @@ static void set_dte_entry(u16 devid, struct protection_domain *domain,
         flags &= ~DEV_DOMID_MASK;
         flags |= domain->id;
 
+        old_domid = amd_iommu_dev_table[devid].data[1] & DEV_DOMID_MASK;
         amd_iommu_dev_table[devid].data[1]  = flags;
         amd_iommu_dev_table[devid].data[0]  = pte_root;
+
+        /*
+         * A kdump kernel might be replacing a domain ID that was copied from
+         * the previous kernel--if so, it needs to flush the translation cache
+         * entries for the old domain ID that is being overwritten
+         */
+        if (old_domid) {
+                struct amd_iommu *iommu = amd_iommu_rlookup_table[devid];
+
+                amd_iommu_flush_tlb_domid(iommu, old_domid);
+        }
 }
 
 static void clear_dte_entry(u16 devid)
@@ -2226,7 +2256,7 @@ static int amd_iommu_add_device(struct device *dev)
 
         BUG_ON(!dev_data);
 
-        if (iommu_pass_through || dev_data->iommu_v2)
+        if (dev_data->iommu_v2)
                 iommu_request_dm_for_dev(dev);
 
         /* Domains are initialized for this device - have a look what we ended up with */
@@ -2547,7 +2577,9 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
 
                         bus_addr  = address + s->dma_address + (j << PAGE_SHIFT);
                         phys_addr = (sg_phys(s) & PAGE_MASK) + (j << PAGE_SHIFT);
-                        ret = iommu_map_page(domain, bus_addr, phys_addr, PAGE_SIZE, prot, GFP_ATOMIC);
+                        ret = iommu_map_page(domain, bus_addr, phys_addr,
+                                             PAGE_SIZE, prot,
+                                             GFP_ATOMIC | __GFP_NOWARN);
                         if (ret)
                                 goto out_unmap;
 
@@ -2805,7 +2837,7 @@ int __init amd_iommu_init_api(void)
 
 int __init amd_iommu_init_dma_ops(void)
 {
-        swiotlb        = (iommu_pass_through || sme_me_mask) ? 1 : 0;
+        swiotlb        = (iommu_default_passthrough() || sme_me_mask) ? 1 : 0;
         iommu_detected = 1;
 
         if (amd_iommu_unmap_flush)
@@ -4314,13 +4346,62 @@ static const struct irq_domain_ops amd_ir_domain_ops = {
         .deactivate = irq_remapping_deactivate,
 };
 
+int amd_iommu_activate_guest_mode(void *data)
+{
+        struct amd_ir_data *ir_data = (struct amd_ir_data *)data;
+        struct irte_ga *entry = (struct irte_ga *) ir_data->entry;
+
+        if (!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir) ||
+            !entry || entry->lo.fields_vapic.guest_mode)
+                return 0;
+
+        entry->lo.val = 0;
+        entry->hi.val = 0;
+
+        entry->lo.fields_vapic.guest_mode  = 1;
+        entry->lo.fields_vapic.ga_log_intr = 1;
+        entry->hi.fields.ga_root_ptr       = ir_data->ga_root_ptr;
+        entry->hi.fields.vector            = ir_data->ga_vector;
+        entry->lo.fields_vapic.ga_tag      = ir_data->ga_tag;
+
+        return modify_irte_ga(ir_data->irq_2_irte.devid,
+                              ir_data->irq_2_irte.index, entry, NULL);
+}
+EXPORT_SYMBOL(amd_iommu_activate_guest_mode);
+
+int amd_iommu_deactivate_guest_mode(void *data)
+{
+        struct amd_ir_data *ir_data = (struct amd_ir_data *)data;
+        struct irte_ga *entry = (struct irte_ga *) ir_data->entry;
+        struct irq_cfg *cfg = ir_data->cfg;
+
+        if (!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir) ||
+            !entry || !entry->lo.fields_vapic.guest_mode)
+                return 0;
+
+        entry->lo.val = 0;
+        entry->hi.val = 0;
+
+        entry->lo.fields_remap.dm          = apic->irq_dest_mode;
+        entry->lo.fields_remap.int_type    = apic->irq_delivery_mode;
+        entry->hi.fields.vector            = cfg->vector;
+        entry->lo.fields_remap.destination =
+                                APICID_TO_IRTE_DEST_LO(cfg->dest_apicid);
+        entry->hi.fields.destination =
+                                APICID_TO_IRTE_DEST_HI(cfg->dest_apicid);
+
+        return modify_irte_ga(ir_data->irq_2_irte.devid,
+                              ir_data->irq_2_irte.index, entry, NULL);
+}
+EXPORT_SYMBOL(amd_iommu_deactivate_guest_mode);
+
 static int amd_ir_set_vcpu_affinity(struct irq_data *data, void *vcpu_info)
 {
+        int ret;
         struct amd_iommu *iommu;
         struct amd_iommu_pi_data *pi_data = vcpu_info;
         struct vcpu_data *vcpu_pi_info = pi_data->vcpu_data;
         struct amd_ir_data *ir_data = data->chip_data;
-        struct irte_ga *irte = (struct irte_ga *) ir_data->entry;
         struct irq_2_irte *irte_info = &ir_data->irq_2_irte;
         struct iommu_dev_data *dev_data = search_dev_data(irte_info->devid);
 
@@ -4331,6 +4412,7 @@ static int amd_ir_set_vcpu_affinity(struct irq_data *data, void *vcpu_info)
         if (!dev_data || !dev_data->use_vapic)
                 return 0;
 
+        ir_data->cfg = irqd_cfg(data);
         pi_data->ir_data = ir_data;
 
         /* Note:
@@ -4349,37 +4431,24 @@ static int amd_ir_set_vcpu_affinity(struct irq_data *data, void *vcpu_info)
 
         pi_data->prev_ga_tag = ir_data->cached_ga_tag;
         if (pi_data->is_guest_mode) {
-                /* Setting */
-                irte->hi.fields.ga_root_ptr = (pi_data->base >> 12);
-                irte->hi.fields.vector = vcpu_pi_info->vector;
-                irte->lo.fields_vapic.ga_log_intr = 1;
-                irte->lo.fields_vapic.guest_mode = 1;
-                irte->lo.fields_vapic.ga_tag = pi_data->ga_tag;
-
-                ir_data->cached_ga_tag = pi_data->ga_tag;
+                ir_data->ga_root_ptr = (pi_data->base >> 12);
+                ir_data->ga_vector = vcpu_pi_info->vector;
+                ir_data->ga_tag = pi_data->ga_tag;
+                ret = amd_iommu_activate_guest_mode(ir_data);
+                if (!ret)
+                        ir_data->cached_ga_tag = pi_data->ga_tag;
         } else {
-                /* Un-Setting */
-                struct irq_cfg *cfg = irqd_cfg(data);
-
-                irte->hi.val = 0;
-                irte->lo.val = 0;
-                irte->hi.fields.vector = cfg->vector;
-                irte->lo.fields_remap.guest_mode = 0;
-                irte->lo.fields_remap.destination =
-                                APICID_TO_IRTE_DEST_LO(cfg->dest_apicid);
-                irte->hi.fields.destination =
-                                APICID_TO_IRTE_DEST_HI(cfg->dest_apicid);
-                irte->lo.fields_remap.int_type = apic->irq_delivery_mode;
-                irte->lo.fields_remap.dm = apic->irq_dest_mode;
+                ret = amd_iommu_deactivate_guest_mode(ir_data);
 
                 /*
                  * This communicates the ga_tag back to the caller
                  * so that it can do all the necessary clean up.
                  */
-                ir_data->cached_ga_tag = 0;
+                if (!ret)
+                        ir_data->cached_ga_tag = 0;
         }
 
-        return modify_irte_ga(irte_info->devid, irte_info->index, irte, ir_data);
+        return ret;
 }
 
 
diff --git a/drivers/iommu/amd_iommu.h b/drivers/iommu/amd_iommu.h
new file mode 100644
index 000000000000..12d540d9b59b
--- /dev/null
+++ b/drivers/iommu/amd_iommu.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef AMD_IOMMU_H
+#define AMD_IOMMU_H
+
+int __init add_special_device(u8 type, u8 id, u16 *devid, bool cmd_line);
+
+#ifdef CONFIG_DMI
+void amd_iommu_apply_ivrs_quirks(void);
+#else
+static void amd_iommu_apply_ivrs_quirks(void) { }
+#endif
+
+#endif
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 4413aa67000e..568c52317757 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -32,6 +32,7 @@
 #include <asm/irq_remapping.h>
 
 #include <linux/crash_dump.h>
+#include "amd_iommu.h"
 #include "amd_iommu_proto.h"
 #include "amd_iommu_types.h"
 #include "irq_remapping.h"
@@ -1002,7 +1003,7 @@ static void __init set_dev_entry_from_acpi(struct amd_iommu *iommu,
         set_iommu_for_device(iommu, devid);
 }
 
-static int __init add_special_device(u8 type, u8 id, u16 *devid, bool cmd_line)
+int __init add_special_device(u8 type, u8 id, u16 *devid, bool cmd_line)
 {
         struct devid_map *entry;
         struct list_head *list;
@@ -1153,6 +1154,8 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
         if (ret)
                 return ret;
 
+        amd_iommu_apply_ivrs_quirks();
+
         /*
          * First save the recommended feature enable bits from ACPI
          */
diff --git a/drivers/iommu/amd_iommu_quirks.c b/drivers/iommu/amd_iommu_quirks.c
new file mode 100644
index 000000000000..c235f79b7a20
--- /dev/null
+++ b/drivers/iommu/amd_iommu_quirks.c
@@ -0,0 +1,92 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+/*
+ * Quirks for AMD IOMMU
+ *
+ * Copyright (C) 2019 Kai-Heng Feng <kai.heng.feng@canonical.com>
+ */
+
+#ifdef CONFIG_DMI
+#include <linux/dmi.h>
+
+#include "amd_iommu.h"
+
+#define IVHD_SPECIAL_IOAPIC             1
+
+struct ivrs_quirk_entry {
+        u8 id;
+        u16 devid;
+};
+
+enum {
+        DELL_INSPIRON_7375 = 0,
+        DELL_LATITUDE_5495,
+        LENOVO_IDEAPAD_330S_15ARR,
+};
+
+static const struct ivrs_quirk_entry ivrs_ioapic_quirks[][3] __initconst = {
+        /* ivrs_ioapic[4]=00:14.0 ivrs_ioapic[5]=00:00.2 */
+        [DELL_INSPIRON_7375] = {
+                { .id = 4, .devid = 0xa0 },
+                { .id = 5, .devid = 0x2 },
+                {}
+        },
+        /* ivrs_ioapic[4]=00:14.0 */
+        [DELL_LATITUDE_5495] = {
+                { .id = 4, .devid = 0xa0 },
+                {}
+        },
+        /* ivrs_ioapic[32]=00:14.0 */
+        [LENOVO_IDEAPAD_330S_15ARR] = {
+                { .id = 32, .devid = 0xa0 },
+                {}
+        },
+        {}
+};
+
+static int __init ivrs_ioapic_quirk_cb(const struct dmi_system_id *d)
+{
+        const struct ivrs_quirk_entry *i;
+
+        for (i = d->driver_data; i->id != 0 && i->devid != 0; i++)
+                add_special_device(IVHD_SPECIAL_IOAPIC, i->id, (u16 *)&i->devid, 0);
+
+        return 0;
+}
+
+static const struct dmi_system_id ivrs_quirks[] __initconst = {
+        {
+                .callback = ivrs_ioapic_quirk_cb,
+                .ident = "Dell Inspiron 7375",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7375"),
+                },
+                .driver_data = (void *)&ivrs_ioapic_quirks[DELL_INSPIRON_7375],
+        },
+        {
+                .callback = ivrs_ioapic_quirk_cb,
+                .ident = "Dell Latitude 5495",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Latitude 5495"),
+                },
+                .driver_data = (void *)&ivrs_ioapic_quirks[DELL_LATITUDE_5495],
+        },
+        {
+                .callback = ivrs_ioapic_quirk_cb,
+                .ident = "Lenovo ideapad 330S-15ARR",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "81FB"),
+                },
+                .driver_data = (void *)&ivrs_ioapic_quirks[LENOVO_IDEAPAD_330S_15ARR],
+        },
+        {}
+};
+
+void __init amd_iommu_apply_ivrs_quirks(void)
+{
+        dmi_check_system(ivrs_quirks);
+}
+#endif
diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h
index 64edd5a9694c..9ac229e92b07 100644
--- a/drivers/iommu/amd_iommu_types.h
+++ b/drivers/iommu/amd_iommu_types.h
@@ -873,6 +873,15 @@ struct amd_ir_data {
         struct msi_msg msi_entry;
         void *entry;    /* Pointer to union irte or struct irte_ga */
         void *ref;      /* Pointer to the actual irte */
+
+        /**
+         * Store information for activate/de-activate
+         * Guest virtual APIC mode during runtime.
+         */
+        struct irq_cfg *cfg;
+        int ga_vector;
+        int ga_root_ptr;
+        int ga_tag;
 };
 
 struct amd_irte_ops {
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 315e0087c19f..8f412af84247 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -303,13 +303,15 @@ static int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base,
                 u64 size, struct device *dev)
 {
         struct iommu_dma_cookie *cookie = domain->iova_cookie;
-        struct iova_domain *iovad = &cookie->iovad;
         unsigned long order, base_pfn;
+        struct iova_domain *iovad;
         int attr;
 
         if (!cookie || cookie->type != IOMMU_DMA_IOVA_COOKIE)
                 return -EINVAL;
 
+        iovad = &cookie->iovad;
+
         /* Use the smallest supported page size for IOVA granularity */
         order = __ffs(domain->pgsize_bitmap);
         base_pfn = max_t(unsigned long, 1, base >> order);
@@ -970,11 +972,14 @@ static void *iommu_dma_alloc_pages(struct device *dev, size_t size,
 {
         bool coherent = dev_is_dma_coherent(dev);
         size_t alloc_size = PAGE_ALIGN(size);
+        int node = dev_to_node(dev);
         struct page *page = NULL;
         void *cpu_addr;
 
         page = dma_alloc_contiguous(dev, alloc_size, gfp);
         if (!page)
+                page = alloc_pages_node(node, gfp, get_order(alloc_size));
+        if (!page)
                 return NULL;
 
         if (IS_ENABLED(CONFIG_DMA_REMAP) && (!coherent || PageHighMem(page))) {
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index 5d0754ed5fa0..eecd6a421667 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -1519,6 +1519,64 @@ static const char *dma_remap_fault_reasons[] =
         "PCE for translation request specifies blocking",
 };
 
+static const char * const dma_remap_sm_fault_reasons[] = {
+        "SM: Invalid Root Table Address",
+        "SM: TTM 0 for request with PASID",
+        "SM: TTM 0 for page group request",
+        "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", /* 0x33-0x37 */
+        "SM: Error attempting to access Root Entry",
+        "SM: Present bit in Root Entry is clear",
+        "SM: Non-zero reserved field set in Root Entry",
+        "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", /* 0x3B-0x3F */
+        "SM: Error attempting to access Context Entry",
+        "SM: Present bit in Context Entry is clear",
+        "SM: Non-zero reserved field set in the Context Entry",
+        "SM: Invalid Context Entry",
+        "SM: DTE field in Context Entry is clear",
+        "SM: PASID Enable field in Context Entry is clear",
+        "SM: PASID is larger than the max in Context Entry",
+        "SM: PRE field in Context-Entry is clear",
+        "SM: RID_PASID field error in Context-Entry",
+        "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", /* 0x49-0x4F */
+        "SM: Error attempting to access the PASID Directory Entry",
+        "SM: Present bit in Directory Entry is clear",
+        "SM: Non-zero reserved field set in PASID Directory Entry",
+        "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", /* 0x53-0x57 */
+        "SM: Error attempting to access PASID Table Entry",
+        "SM: Present bit in PASID Table Entry is clear",
+        "SM: Non-zero reserved field set in PASID Table Entry",
+        "SM: Invalid Scalable-Mode PASID Table Entry",
+        "SM: ERE field is clear in PASID Table Entry",
+        "SM: SRE field is clear in PASID Table Entry",
+        "Unknown", "Unknown",/* 0x5E-0x5F */
+        "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", /* 0x60-0x67 */
+        "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", /* 0x68-0x6F */
+        "SM: Error attempting to access first-level paging entry",
+        "SM: Present bit in first-level paging entry is clear",
+        "SM: Non-zero reserved field set in first-level paging entry",
+        "SM: Error attempting to access FL-PML4 entry",
+        "SM: First-level entry address beyond MGAW in Nested translation",
+        "SM: Read permission error in FL-PML4 entry in Nested translation",
+        "SM: Read permission error in first-level paging entry in Nested translation",
+        "SM: Write permission error in first-level paging entry in Nested translation",
+        "SM: Error attempting to access second-level paging entry",
+        "SM: Read/Write permission error in second-level paging entry",
+        "SM: Non-zero reserved field set in second-level paging entry",
+        "SM: Invalid second-level page table pointer",
+        "SM: A/D bit update needed in second-level entry when set up in no snoop",
+        "Unknown", "Unknown", "Unknown", /* 0x7D-0x7F */
+        "SM: Address in first-level translation is not canonical",
+        "SM: U/S set 0 for first-level translation with user privilege",
+        "SM: No execute permission for request with PASID and ER=1",
+        "SM: Address beyond the DMA hardware max",
+        "SM: Second-level entry address beyond the max",
+        "SM: No write permission for Write/AtomicOp request",
+        "SM: No read permission for Read/AtomicOp request",
+        "SM: Invalid address-interrupt address",
+        "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", /* 0x88-0x8F */
+        "SM: A/D bit update needed in first-level entry when set up in no snoop",
+};
+
 static const char *irq_remap_fault_reasons[] =
 {
         "Detected reserved fields in the decoded interrupt-remapped request",
@@ -1536,6 +1594,10 @@ static const char *dmar_get_fault_reason(u8 fault_reason, int *fault_type)
                                         ARRAY_SIZE(irq_remap_fault_reasons))) {
                 *fault_type = INTR_REMAP;
                 return irq_remap_fault_reasons[fault_reason - 0x20];
+        } else if (fault_reason >= 0x30 && (fault_reason - 0x30 <
+                        ARRAY_SIZE(dma_remap_sm_fault_reasons))) {
+                *fault_type = DMA_REMAP;
+                return dma_remap_sm_fault_reasons[fault_reason - 0x30];
         } else if (fault_reason < ARRAY_SIZE(dma_remap_fault_reasons)) {
                 *fault_type = DMA_REMAP;
                 return dma_remap_fault_reasons[fault_reason];
@@ -1611,7 +1673,8 @@ void dmar_msi_read(int irq, struct msi_msg *msg)
 }
 
 static int dmar_fault_do_one(struct intel_iommu *iommu, int type,
-                u8 fault_reason, u16 source_id, unsigned long long addr)
+                u8 fault_reason, int pasid, u16 source_id,
+                unsigned long long addr)
 {
         const char *reason;
         int fault_type;
@@ -1624,10 +1687,11 @@ static int dmar_fault_do_one(struct intel_iommu *iommu, int type,
                         PCI_FUNC(source_id & 0xFF), addr >> 48,
                         fault_reason, reason);
         else
-                pr_err("[%s] Request device [%02x:%02x.%d] fault addr %llx [fault reason %02d] %s\n",
+                pr_err("[%s] Request device [%02x:%02x.%d] PASID %x fault addr %llx [fault reason %02d] %s\n",
                        type ? "DMA Read" : "DMA Write",
                        source_id >> 8, PCI_SLOT(source_id & 0xFF),
-                       PCI_FUNC(source_id & 0xFF), addr, fault_reason, reason);
+                       PCI_FUNC(source_id & 0xFF), pasid, addr,
+                       fault_reason, reason);
         return 0;
 }
 
@@ -1659,8 +1723,9 @@ irqreturn_t dmar_fault(int irq, void *dev_id)
                 u8 fault_reason;
                 u16 source_id;
                 u64 guest_addr;
-                int type;
+                int type, pasid;
                 u32 data;
+                bool pasid_present;
 
                 /* highest 32 bits */
                 data = readl(iommu->reg + reg +
@@ -1672,10 +1737,12 @@ irqreturn_t dmar_fault(int irq, void *dev_id)
                         fault_reason = dma_frcd_fault_reason(data);
                         type = dma_frcd_type(data);
 
+                        pasid = dma_frcd_pasid_value(data);
                         data = readl(iommu->reg + reg +
                                      fault_index * PRIMARY_FAULT_REG_LEN + 8);
                         source_id = dma_frcd_source_id(data);
 
+                        pasid_present = dma_frcd_pasid_present(data);
                         guest_addr = dmar_readq(iommu->reg + reg +
                                         fault_index * PRIMARY_FAULT_REG_LEN);
                         guest_addr = dma_frcd_page_addr(guest_addr);
@@ -1688,7 +1755,9 @@ irqreturn_t dmar_fault(int irq, void *dev_id)
                 raw_spin_unlock_irqrestore(&iommu->register_lock, flag);
 
                 if (!ratelimited)
+                        /* Using pasid -1 if pasid is not present */
                         dmar_fault_do_one(iommu, type, fault_reason,
+                                          pasid_present ? pasid : -1,
                                           source_id, guest_addr);
 
                 fault_index++;
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index cf5af34cb681..9c94e16fb127 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -566,7 +566,7 @@ static void sysmmu_tlb_invalidate_entry(struct sysmmu_drvdata *data,
 
 static const struct iommu_ops exynos_iommu_ops;
 
-static int __init exynos_sysmmu_probe(struct platform_device *pdev)
+static int exynos_sysmmu_probe(struct platform_device *pdev)
 {
         int irq, ret;
         struct device *dev = &pdev->dev;
@@ -583,10 +583,8 @@ static int __init exynos_sysmmu_probe(struct platform_device *pdev)
                 return PTR_ERR(data->sfrbase);
 
         irq = platform_get_irq(pdev, 0);
-        if (irq <= 0) {
-                dev_err(dev, "Unable to find IRQ resource\n");
+        if (irq <= 0)
                 return irq;
-        }
 
         ret = devm_request_irq(dev, irq, exynos_sysmmu_irq, 0,
                                 dev_name(dev), data);
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index b7454ca4a87c..87de0b975672 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -41,9 +41,11 @@
 #include <linux/dma-direct.h>
 #include <linux/crash_dump.h>
 #include <linux/numa.h>
+#include <linux/swiotlb.h>
 #include <asm/irq_remapping.h>
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
+#include <trace/events/intel_iommu.h>
 
 #include "irq_remapping.h"
 #include "intel-pasid.h"
@@ -339,11 +341,15 @@ static void domain_exit(struct dmar_domain *domain);
 static void domain_remove_dev_info(struct dmar_domain *domain);
 static void dmar_remove_one_dev_info(struct device *dev);
 static void __dmar_remove_one_dev_info(struct device_domain_info *info);
+static void domain_context_clear(struct intel_iommu *iommu,
+                                 struct device *dev);
 static int domain_detach_iommu(struct dmar_domain *domain,
                                struct intel_iommu *iommu);
 static bool device_is_rmrr_locked(struct device *dev);
 static int intel_iommu_attach_device(struct iommu_domain *domain,
                                      struct device *dev);
+static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain,
+                                            dma_addr_t iova);
 
 #ifdef CONFIG_INTEL_IOMMU_DEFAULT_ON
 int dmar_disabled = 0;
@@ -360,6 +366,7 @@ static int dmar_forcedac;
 static int intel_iommu_strict;
 static int intel_iommu_superpage = 1;
 static int iommu_identity_mapping;
+static int intel_no_bounce;
 
 #define IDENTMAP_ALL            1
 #define IDENTMAP_GFX            2
@@ -373,6 +380,9 @@ EXPORT_SYMBOL_GPL(intel_iommu_gfx_mapped);
 static DEFINE_SPINLOCK(device_domain_lock);
 static LIST_HEAD(device_domain_list);
 
+#define device_needs_bounce(d) (!intel_no_bounce && dev_is_pci(d) &&    \
+                                to_pci_dev(d)->untrusted)
+
 /*
  * Iterate over elements in device_domain_list and call the specified
  * callback @fn against each element.
@@ -455,6 +465,9 @@ static int __init intel_iommu_setup(char *str)
                         printk(KERN_INFO
                                 "Intel-IOMMU: not forcing on after tboot. This could expose security risk for tboot\n");
                         intel_iommu_tboot_noforce = 1;
+                } else if (!strncmp(str, "nobounce", 8)) {
+                        pr_info("Intel-IOMMU: No bounce buffer. This could expose security risks of DMA attacks\n");
+                        intel_no_bounce = 1;
                 }
 
                 str += strcspn(str, ",");
@@ -2105,9 +2118,26 @@ out_unlock:
         return ret;
 }
 
+struct domain_context_mapping_data {
+        struct dmar_domain *domain;
+        struct intel_iommu *iommu;
+        struct pasid_table *table;
+};
+
+static int domain_context_mapping_cb(struct pci_dev *pdev,
+                                     u16 alias, void *opaque)
+{
+        struct domain_context_mapping_data *data = opaque;
+
+        return domain_context_mapping_one(data->domain, data->iommu,
+                                          data->table, PCI_BUS_NUM(alias),
+                                          alias & 0xff);
+}
+
 static int
 domain_context_mapping(struct dmar_domain *domain, struct device *dev)
 {
+        struct domain_context_mapping_data data;
         struct pasid_table *table;
         struct intel_iommu *iommu;
         u8 bus, devfn;
@@ -2117,7 +2147,17 @@ domain_context_mapping(struct dmar_domain *domain, struct device *dev)
                 return -ENODEV;
 
         table = intel_pasid_get_table(dev);
-        return domain_context_mapping_one(domain, iommu, table, bus, devfn);
+
+        if (!dev_is_pci(dev))
+                return domain_context_mapping_one(domain, iommu, table,
+                                                  bus, devfn);
+
+        data.domain = domain;
+        data.iommu = iommu;
+        data.table = table;
+
+        return pci_for_each_dma_alias(to_pci_dev(dev),
+                                      &domain_context_mapping_cb, &data);
 }
 
 static int domain_context_mapped_cb(struct pci_dev *pdev,
@@ -3267,7 +3307,7 @@ static int __init init_dmars(void)
                 iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);
         }
 
-        if (iommu_pass_through)
+        if (iommu_default_passthrough())
                 iommu_identity_mapping |= IDENTMAP_ALL;
 
 #ifdef CONFIG_INTEL_IOMMU_BROKEN_GFX_WA
@@ -3505,6 +3545,9 @@ static dma_addr_t __intel_map_single(struct device *dev, phys_addr_t paddr,
 
         start_paddr = (phys_addr_t)iova_pfn << PAGE_SHIFT;
         start_paddr += paddr & ~PAGE_MASK;
+
+        trace_map_single(dev, start_paddr, paddr, size << VTD_PAGE_SHIFT);
+
         return start_paddr;
 
 error:
@@ -3560,10 +3603,7 @@ static void intel_unmap(struct device *dev, dma_addr_t dev_addr, size_t size)
         if (dev_is_pci(dev))
                 pdev = to_pci_dev(dev);
 
-        dev_dbg(dev, "Device unmapping: pfn %lx-%lx\n", start_pfn, last_pfn);
-
         freelist = domain_unmap(domain, start_pfn, last_pfn);
-
         if (intel_iommu_strict || (pdev && pdev->untrusted) ||
                         !has_iova_flush_queue(&domain->iovad)) {
                 iommu_flush_iotlb_psi(iommu, domain, start_pfn,
@@ -3579,6 +3619,8 @@ static void intel_unmap(struct device *dev, dma_addr_t dev_addr, size_t size)
                  * cpu used up by the iotlb flush operation...
                  */
         }
+
+        trace_unmap_single(dev, dev_addr, size);
 }
 
 static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
@@ -3669,6 +3711,8 @@ static void intel_unmap_sg(struct device *dev, struct scatterlist *sglist,
         }
 
         intel_unmap(dev, startaddr, nrpages << VTD_PAGE_SHIFT);
+
+        trace_unmap_sg(dev, startaddr, nrpages << VTD_PAGE_SHIFT);
 }
 
 static int intel_map_sg(struct device *dev, struct scatterlist *sglist, int nelems,
@@ -3725,6 +3769,9 @@ static int intel_map_sg(struct device *dev, struct scatterlist *sglist, int nele
                 return 0;
         }
 
+        trace_map_sg(dev, iova_pfn << PAGE_SHIFT,
+                     sg_phys(sglist), size << VTD_PAGE_SHIFT);
+
         return nelems;
 }
 
@@ -3740,6 +3787,252 @@ static const struct dma_map_ops intel_dma_ops = {
         .dma_supported = dma_direct_supported,
 };
 
+static void
+bounce_sync_single(struct device *dev, dma_addr_t addr, size_t size,
+                   enum dma_data_direction dir, enum dma_sync_target target)
+{
+        struct dmar_domain *domain;
+        phys_addr_t tlb_addr;
+
+        domain = find_domain(dev);
+        if (WARN_ON(!domain))
+                return;
+
+        tlb_addr = intel_iommu_iova_to_phys(&domain->domain, addr);
+        if (is_swiotlb_buffer(tlb_addr))
+                swiotlb_tbl_sync_single(dev, tlb_addr, size, dir, target);
+}
+
+static dma_addr_t
+bounce_map_single(struct device *dev, phys_addr_t paddr, size_t size,
+                  enum dma_data_direction dir, unsigned long attrs,
+                  u64 dma_mask)
+{
+        size_t aligned_size = ALIGN(size, VTD_PAGE_SIZE);
+        struct dmar_domain *domain;
+        struct intel_iommu *iommu;
+        unsigned long iova_pfn;
+        unsigned long nrpages;
+        phys_addr_t tlb_addr;
+        int prot = 0;
+        int ret;
+
+        domain = find_domain(dev);
+        if (WARN_ON(dir == DMA_NONE || !domain))
+                return DMA_MAPPING_ERROR;
+
+        iommu = domain_get_iommu(domain);
+        if (WARN_ON(!iommu))
+                return DMA_MAPPING_ERROR;
+
+        nrpages = aligned_nrpages(0, size);
+        iova_pfn = intel_alloc_iova(dev, domain,
+                                    dma_to_mm_pfn(nrpages), dma_mask);
+        if (!iova_pfn)
+                return DMA_MAPPING_ERROR;
+
+        /*
+         * Check if DMAR supports zero-length reads on write only
+         * mappings..
+         */
+        if (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL ||
+                        !cap_zlr(iommu->cap))
+                prot |= DMA_PTE_READ;
+        if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)
+                prot |= DMA_PTE_WRITE;
+
+        /*
+         * If both the physical buffer start address and size are
+         * page aligned, we don't need to use a bounce page.
+         */
+        if (!IS_ALIGNED(paddr | size, VTD_PAGE_SIZE)) {
+                tlb_addr = swiotlb_tbl_map_single(dev,
+                                __phys_to_dma(dev, io_tlb_start),
+                                paddr, size, aligned_size, dir, attrs);
+                if (tlb_addr == DMA_MAPPING_ERROR) {
+                        goto swiotlb_error;
+                } else {
+                        /* Cleanup the padding area. */
+                        void *padding_start = phys_to_virt(tlb_addr);
+                        size_t padding_size = aligned_size;
+
+                        if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&
+                            (dir == DMA_TO_DEVICE ||
+                             dir == DMA_BIDIRECTIONAL)) {
+                                padding_start += size;
+                                padding_size -= size;
+                        }
+
+                        memset(padding_start, 0, padding_size);
+                }
+        } else {
+                tlb_addr = paddr;
+        }
+
+        ret = domain_pfn_mapping(domain, mm_to_dma_pfn(iova_pfn),
+                                 tlb_addr >> VTD_PAGE_SHIFT, nrpages, prot);
+        if (ret)
+                goto mapping_error;
+
+        trace_bounce_map_single(dev, iova_pfn << PAGE_SHIFT, paddr, size);
+
+        return (phys_addr_t)iova_pfn << PAGE_SHIFT;
+
+mapping_error:
+        if (is_swiotlb_buffer(tlb_addr))
+                swiotlb_tbl_unmap_single(dev, tlb_addr, size,
+                                         aligned_size, dir, attrs);
+swiotlb_error:
+        free_iova_fast(&domain->iovad, iova_pfn, dma_to_mm_pfn(nrpages));
+        dev_err(dev, "Device bounce map: %zx@%llx dir %d --- failed\n",
+                size, (unsigned long long)paddr, dir);
+
+        return DMA_MAPPING_ERROR;
+}
+
+static void
+bounce_unmap_single(struct device *dev, dma_addr_t dev_addr, size_t size,
+                    enum dma_data_direction dir, unsigned long attrs)
+{
+        size_t aligned_size = ALIGN(size, VTD_PAGE_SIZE);
+        struct dmar_domain *domain;
+        phys_addr_t tlb_addr;
+
+        domain = find_domain(dev);
+        if (WARN_ON(!domain))
+                return;
+
+        tlb_addr = intel_iommu_iova_to_phys(&domain->domain, dev_addr);
+        if (WARN_ON(!tlb_addr))
+                return;
+
+        intel_unmap(dev, dev_addr, size);
+        if (is_swiotlb_buffer(tlb_addr))
+                swiotlb_tbl_unmap_single(dev, tlb_addr, size,
+                                         aligned_size, dir, attrs);
+
+        trace_bounce_unmap_single(dev, dev_addr, size);
+}
+
+static dma_addr_t
+bounce_map_page(struct device *dev, struct page *page, unsigned long offset,
+                size_t size, enum dma_data_direction dir, unsigned long attrs)
+{
+        return bounce_map_single(dev, page_to_phys(page) + offset,
+                                 size, dir, attrs, *dev->dma_mask);
+}
+
+static dma_addr_t
+bounce_map_resource(struct device *dev, phys_addr_t phys_addr, size_t size,
+                    enum dma_data_direction dir, unsigned long attrs)
+{
+        return bounce_map_single(dev, phys_addr, size,
+                                 dir, attrs, *dev->dma_mask);
+}
+
+static void
+bounce_unmap_page(struct device *dev, dma_addr_t dev_addr, size_t size,
+                  enum dma_data_direction dir, unsigned long attrs)
+{
+        bounce_unmap_single(dev, dev_addr, size, dir, attrs);
+}
+
+static void
+bounce_unmap_resource(struct device *dev, dma_addr_t dev_addr, size_t size,
+                      enum dma_data_direction dir, unsigned long attrs)
+{
+        bounce_unmap_single(dev, dev_addr, size, dir, attrs);
+}
+
+static void
+bounce_unmap_sg(struct device *dev, struct scatterlist *sglist, int nelems,
+                enum dma_data_direction dir, unsigned long attrs)
+{
+        struct scatterlist *sg;
+        int i;
+
+        for_each_sg(sglist, sg, nelems, i)
+                bounce_unmap_page(dev, sg->dma_address,
+                                  sg_dma_len(sg), dir, attrs);
+}
+
+static int
+bounce_map_sg(struct device *dev, struct scatterlist *sglist, int nelems,
+              enum dma_data_direction dir, unsigned long attrs)
+{
+        int i;
+        struct scatterlist *sg;
+
+        for_each_sg(sglist, sg, nelems, i) {
+                sg->dma_address = bounce_map_page(dev, sg_page(sg),
+                                                  sg->offset, sg->length,
+                                                  dir, attrs);
+                if (sg->dma_address == DMA_MAPPING_ERROR)
+                        goto out_unmap;
+                sg_dma_len(sg) = sg->length;
+        }
+
+        return nelems;
+
+out_unmap:
+        bounce_unmap_sg(dev, sglist, i, dir, attrs | DMA_ATTR_SKIP_CPU_SYNC);
+        return 0;
+}
+
+static void
+bounce_sync_single_for_cpu(struct device *dev, dma_addr_t addr,
+                           size_t size, enum dma_data_direction dir)
+{
+        bounce_sync_single(dev, addr, size, dir, SYNC_FOR_CPU);
+}
+
+static void
+bounce_sync_single_for_device(struct device *dev, dma_addr_t addr,
+                              size_t size, enum dma_data_direction dir)
+{
+        bounce_sync_single(dev, addr, size, dir, SYNC_FOR_DEVICE);
+}
+
+static void
+bounce_sync_sg_for_cpu(struct device *dev, struct scatterlist *sglist,
+                       int nelems, enum dma_data_direction dir)
+{
+        struct scatterlist *sg;
+        int i;
+
+        for_each_sg(sglist, sg, nelems, i)
+                bounce_sync_single(dev, sg_dma_address(sg),
+                                   sg_dma_len(sg), dir, SYNC_FOR_CPU);
+}
+
+static void
+bounce_sync_sg_for_device(struct device *dev, struct scatterlist *sglist,
+                          int nelems, enum dma_data_direction dir)
+{
+        struct scatterlist *sg;
+        int i;
+
+        for_each_sg(sglist, sg, nelems, i)
+                bounce_sync_single(dev, sg_dma_address(sg),
+                                   sg_dma_len(sg), dir, SYNC_FOR_DEVICE);
+}
+
+static const struct dma_map_ops bounce_dma_ops = {
+        .alloc                  = intel_alloc_coherent,
+        .free                   = intel_free_coherent,
+        .map_sg                 = bounce_map_sg,
+        .unmap_sg               = bounce_unmap_sg,
+        .map_page               = bounce_map_page,
+        .unmap_page             = bounce_unmap_page,
+        .sync_single_for_cpu    = bounce_sync_single_for_cpu,
+        .sync_single_for_device = bounce_sync_single_for_device,
+        .sync_sg_for_cpu        = bounce_sync_sg_for_cpu,
+        .sync_sg_for_device     = bounce_sync_sg_for_device,
+        .map_resource           = bounce_map_resource,
+        .unmap_resource         = bounce_unmap_resource,
+        .dma_supported          = dma_direct_supported,
+};
+
 static inline int iommu_domain_cache_init(void)
 {
         int ret = 0;
@@ -4540,22 +4833,20 @@ const struct attribute_group *intel_iommu_groups[] = {
         NULL,
 };
 
-static int __init platform_optin_force_iommu(void)
+static inline bool has_untrusted_dev(void)
 {
         struct pci_dev *pdev = NULL;
-        bool has_untrusted_dev = false;
 
-        if (!dmar_platform_optin() || no_platform_optin)
-                return 0;
+        for_each_pci_dev(pdev)
+                if (pdev->untrusted)
+                        return true;
 
-        for_each_pci_dev(pdev) {
-                if (pdev->untrusted) {
-                        has_untrusted_dev = true;
-                        break;
-                }
-        }
+        return false;
+}
 
-        if (!has_untrusted_dev)
+static int __init platform_optin_force_iommu(void)
+{
+        if (!dmar_platform_optin() || no_platform_optin || !has_untrusted_dev())
                 return 0;
 
         if (no_iommu || dmar_disabled)
@@ -4569,9 +4860,6 @@ static int __init platform_optin_force_iommu(void)
                 iommu_identity_mapping |= IDENTMAP_ALL;
 
         dmar_disabled = 0;
-#if defined(CONFIG_X86) && defined(CONFIG_SWIOTLB)
-        swiotlb = 0;
-#endif
         no_iommu = 0;
 
         return 1;
@@ -4711,7 +4999,14 @@ int __init intel_iommu_init(void)
         up_write(&dmar_global_lock);
 
 #if defined(CONFIG_X86) && defined(CONFIG_SWIOTLB)
-        swiotlb = 0;
+        /*
+         * If the system has no untrusted device or the user has decided
+         * to disable the bounce page mechanisms, we don't need swiotlb.
+         * Mark this and the pre-allocated bounce pages will be released
+         * later.
+         */
+        if (!has_untrusted_dev() || intel_no_bounce)
+                swiotlb = 0;
 #endif
         dma_ops = &intel_dma_ops;
 
@@ -4759,6 +5054,28 @@ out_free_dmar:
         return ret;
 }
 
+static int domain_context_clear_one_cb(struct pci_dev *pdev, u16 alias, void *opaque)
+{
+        struct intel_iommu *iommu = opaque;
+
+        domain_context_clear_one(iommu, PCI_BUS_NUM(alias), alias & 0xff);
+        return 0;
+}
+
+/*
+ * NB - intel-iommu lacks any sort of reference counting for the users of
+ * dependent devices.  If multiple endpoints have intersecting dependent
+ * devices, unbinding the driver from any one of them will possibly leave
+ * the others unable to operate.
+ */
+static void domain_context_clear(struct intel_iommu *iommu, struct device *dev)
+{
+        if (!iommu || !dev || !dev_is_pci(dev))
+                return;
+
+        pci_for_each_dma_alias(to_pci_dev(dev), &domain_context_clear_one_cb, iommu);
+}
+
 static void __dmar_remove_one_dev_info(struct device_domain_info *info)
 {
         struct dmar_domain *domain;
@@ -4779,7 +5096,7 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info)
                                         PASID_RID2PASID);
 
                 iommu_disable_dev_iotlb(info);
-                domain_context_clear_one(iommu, info->bus, info->devfn);
+                domain_context_clear(iommu, info->dev);
                 intel_pasid_free_table(info->dev);
         }
 
@@ -5310,6 +5627,11 @@ static int intel_iommu_add_device(struct device *dev)
                 }
         }
 
+        if (device_needs_bounce(dev)) {
+                dev_info(dev, "Use Intel IOMMU bounce page dma_ops\n");
+                set_dma_ops(dev, &bounce_dma_ops);
+        }
+
         return 0;
 }
 
@@ -5327,6 +5649,9 @@ static void intel_iommu_remove_device(struct device *dev)
         iommu_group_remove_device(dev);
 
         iommu_device_unlink(&iommu->iommu, dev);
+
+        if (device_needs_bounce(dev))
+                set_dma_ops(dev, NULL);
 }
 
 static void intel_iommu_get_resv_regions(struct device *device,
@@ -5640,20 +5965,46 @@ const struct iommu_ops intel_iommu_ops = {
         .pgsize_bitmap          = INTEL_IOMMU_PGSIZES,
 };
 
-static void quirk_iommu_g4x_gfx(struct pci_dev *dev)
+static void quirk_iommu_igfx(struct pci_dev *dev)
 {
-        /* G4x/GM45 integrated gfx dmar support is totally busted. */
         pci_info(dev, "Disabling IOMMU for graphics on this chipset\n");
         dmar_map_gfx = 0;
 }
 
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_g4x_gfx);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_g4x_gfx);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e10, quirk_iommu_g4x_gfx);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e20, quirk_iommu_g4x_gfx);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e30, quirk_iommu_g4x_gfx);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e40, quirk_iommu_g4x_gfx);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e90, quirk_iommu_g4x_gfx);
+/* G4x/GM45 integrated gfx dmar support is totally busted. */
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e10, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e20, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e30, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e40, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e90, quirk_iommu_igfx);
+
+/* Broadwell igfx malfunctions with dmar */
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1606, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x160B, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x160E, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1602, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x160A, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x160D, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1616, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x161B, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x161E, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1612, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x161A, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x161D, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1626, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x162B, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x162E, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1622, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x162A, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x162D, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1636, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163B, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163E, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163A, quirk_iommu_igfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx);
 
 static void quirk_iommu_rwbf(struct pci_dev *dev)
 {
diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c
index 780de0caafe8..9b159132405d 100644
--- a/drivers/iommu/intel-svm.c
+++ b/drivers/iommu/intel-svm.c
@@ -100,24 +100,19 @@ int intel_svm_finish_prq(struct intel_iommu *iommu)
 }
 
 static void intel_flush_svm_range_dev (struct intel_svm *svm, struct intel_svm_dev *sdev,
-                                       unsigned long address, unsigned long pages, int ih, int gl)
+                                unsigned long address, unsigned long pages, int ih)
 {
         struct qi_desc desc;
 
-        if (pages == -1) {
-                /* For global kernel pages we have to flush them in *all* PASIDs
-                 * because that's the only option the hardware gives us. Despite
-                 * the fact that they are actually only accessible through one. */
-                if (gl)
-                        desc.qw0 = QI_EIOTLB_PASID(svm->pasid) |
-                                        QI_EIOTLB_DID(sdev->did) |
-                                        QI_EIOTLB_GRAN(QI_GRAN_ALL_ALL) |
-                                        QI_EIOTLB_TYPE;
-                else
-                        desc.qw0 = QI_EIOTLB_PASID(svm->pasid) |
-                                        QI_EIOTLB_DID(sdev->did) |
-                                        QI_EIOTLB_GRAN(QI_GRAN_NONG_PASID) |
-                                        QI_EIOTLB_TYPE;
+        /*
+         * Do PASID granu IOTLB invalidation if page selective capability is
+         * not available.
+         */
+        if (pages == -1 || !cap_pgsel_inv(svm->iommu->cap)) {
+                desc.qw0 = QI_EIOTLB_PASID(svm->pasid) |
+                        QI_EIOTLB_DID(sdev->did) |
+                        QI_EIOTLB_GRAN(QI_GRAN_NONG_PASID) |
+                        QI_EIOTLB_TYPE;
                 desc.qw1 = 0;
         } else {
                 int mask = ilog2(__roundup_pow_of_two(pages));
@@ -127,7 +122,6 @@ static void intel_flush_svm_range_dev (struct intel_svm *svm, struct intel_svm_d
                                 QI_EIOTLB_GRAN(QI_GRAN_PSI_PASID) |
                                 QI_EIOTLB_TYPE;
                 desc.qw1 = QI_EIOTLB_ADDR(address) |
-                                QI_EIOTLB_GL(gl) |
                                 QI_EIOTLB_IH(ih) |
                                 QI_EIOTLB_AM(mask);
         }
@@ -162,13 +156,13 @@ static void intel_flush_svm_range_dev (struct intel_svm *svm, struct intel_svm_d
 }
 
 static void intel_flush_svm_range(struct intel_svm *svm, unsigned long address,
-                                  unsigned long pages, int ih, int gl)
+                                unsigned long pages, int ih)
 {
         struct intel_svm_dev *sdev;
 
         rcu_read_lock();
         list_for_each_entry_rcu(sdev, &svm->devs, list)
-                intel_flush_svm_range_dev(svm, sdev, address, pages, ih, gl);
+                intel_flush_svm_range_dev(svm, sdev, address, pages, ih);
         rcu_read_unlock();
 }
 
@@ -180,7 +174,7 @@ static void intel_invalidate_range(struct mmu_notifier *mn,
         struct intel_svm *svm = container_of(mn, struct intel_svm, notifier);
 
         intel_flush_svm_range(svm, start,
-                              (end - start + PAGE_SIZE - 1) >> VTD_PAGE_SHIFT, 0, 0);
+                              (end - start + PAGE_SIZE - 1) >> VTD_PAGE_SHIFT, 0);
 }
 
 static void intel_mm_release(struct mmu_notifier *mn, struct mm_struct *mm)
@@ -203,7 +197,7 @@ static void intel_mm_release(struct mmu_notifier *mn, struct mm_struct *mm)
         rcu_read_lock();
         list_for_each_entry_rcu(sdev, &svm->devs, list) {
                 intel_pasid_tear_down_entry(svm->iommu, sdev->dev, svm->pasid);
-                intel_flush_svm_range_dev(svm, sdev, 0, -1, 0, !svm->mm);
+                intel_flush_svm_range_dev(svm, sdev, 0, -1, 0);
         }
         rcu_read_unlock();
 
@@ -425,7 +419,7 @@ int intel_svm_unbind_mm(struct device *dev, int pasid)
                                  * large and has to be physically contiguous. So it's
                                  * hard to be as defensive as we might like. */
                                 intel_pasid_tear_down_entry(iommu, dev, svm->pasid);
-                                intel_flush_svm_range_dev(svm, sdev, 0, -1, 0, !svm->mm);
+                                intel_flush_svm_range_dev(svm, sdev, 0, -1, 0);
                                 kfree_rcu(sdev, rcu);
 
                                 if (list_empty(&svm->devs)) {
diff --git a/drivers/iommu/intel-trace.c b/drivers/iommu/intel-trace.c
new file mode 100644
index 000000000000..bfb6a6e37a88
--- /dev/null
+++ b/drivers/iommu/intel-trace.c
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Intel IOMMU trace support
+ *
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * Author: Lu Baolu <baolu.lu@linux.intel.com>
+ */
+
+#include <linux/string.h>
+#include <linux/types.h>
+
+#define CREATE_TRACE_POINTS
+#include <trace/events/intel_iommu.h>
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index 4786ca061e31..81e43c1df7ec 100644
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -376,13 +376,13 @@ static int set_msi_sid_cb(struct pci_dev *pdev, u16 alias, void *opaque)
 {
         struct set_msi_sid_data *data = opaque;
 
+        if (data->count == 0 || PCI_BUS_NUM(alias) == PCI_BUS_NUM(data->alias))
+                data->busmatch_count++;
+
         data->pdev = pdev;
         data->alias = alias;
         data->count++;
 
-        if (PCI_BUS_NUM(alias) == pdev->bus->number)
-                data->busmatch_count++;
-
         return 0;
 }
 
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
index 18e7d212c7de..4cb394937700 100644
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@ -112,7 +112,9 @@
 #define ARM_V7S_TEX_MASK                0x7
 #define ARM_V7S_ATTR_TEX(val)           (((val) & ARM_V7S_TEX_MASK) << ARM_V7S_TEX_SHIFT)
 
-#define ARM_V7S_ATTR_MTK_4GB            BIT(9) /* MTK extend it for 4GB mode */
+/* MediaTek extend the two bits for PA 32bit/33bit */
+#define ARM_V7S_ATTR_MTK_PA_BIT32       BIT(9)
+#define ARM_V7S_ATTR_MTK_PA_BIT33       BIT(4)
 
 /* *well, except for TEX on level 2 large pages, of course :( */
 #define ARM_V7S_CONT_PAGE_TEX_SHIFT     6
@@ -169,18 +171,62 @@ struct arm_v7s_io_pgtable {
         spinlock_t              split_lock;
 };
 
+static bool arm_v7s_pte_is_cont(arm_v7s_iopte pte, int lvl);
+
 static dma_addr_t __arm_v7s_dma_addr(void *pages)
 {
         return (dma_addr_t)virt_to_phys(pages);
 }
 
-static arm_v7s_iopte *iopte_deref(arm_v7s_iopte pte, int lvl)
+static bool arm_v7s_is_mtk_enabled(struct io_pgtable_cfg *cfg)
+{
+        return IS_ENABLED(CONFIG_PHYS_ADDR_T_64BIT) &&
+                (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT);
+}
+
+static arm_v7s_iopte paddr_to_iopte(phys_addr_t paddr, int lvl,
+                                    struct io_pgtable_cfg *cfg)
+{
+        arm_v7s_iopte pte = paddr & ARM_V7S_LVL_MASK(lvl);
+
+        if (!arm_v7s_is_mtk_enabled(cfg))
+                return pte;
+
+        if (paddr & BIT_ULL(32))
+                pte |= ARM_V7S_ATTR_MTK_PA_BIT32;
+        if (paddr & BIT_ULL(33))
+                pte |= ARM_V7S_ATTR_MTK_PA_BIT33;
+        return pte;
+}
+
+static phys_addr_t iopte_to_paddr(arm_v7s_iopte pte, int lvl,
+                                  struct io_pgtable_cfg *cfg)
 {
+        arm_v7s_iopte mask;
+        phys_addr_t paddr;
+
         if (ARM_V7S_PTE_IS_TABLE(pte, lvl))
-                pte &= ARM_V7S_TABLE_MASK;
+                mask = ARM_V7S_TABLE_MASK;
+        else if (arm_v7s_pte_is_cont(pte, lvl))
+                mask = ARM_V7S_LVL_MASK(lvl) * ARM_V7S_CONT_PAGES;
         else
-                pte &= ARM_V7S_LVL_MASK(lvl);
-        return phys_to_virt(pte);
+                mask = ARM_V7S_LVL_MASK(lvl);
+
+        paddr = pte & mask;
+        if (!arm_v7s_is_mtk_enabled(cfg))
+                return paddr;
+
+        if (pte & ARM_V7S_ATTR_MTK_PA_BIT32)
+                paddr |= BIT_ULL(32);
+        if (pte & ARM_V7S_ATTR_MTK_PA_BIT33)
+                paddr |= BIT_ULL(33);
+        return paddr;
+}
+
+static arm_v7s_iopte *iopte_deref(arm_v7s_iopte pte, int lvl,
+                                  struct arm_v7s_io_pgtable *data)
+{
+        return phys_to_virt(iopte_to_paddr(pte, lvl, &data->iop.cfg));
 }
 
 static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,
@@ -295,9 +341,6 @@ static arm_v7s_iopte arm_v7s_prot_to_pte(int prot, int lvl,
         if (lvl == 1 && (cfg->quirks & IO_PGTABLE_QUIRK_ARM_NS))
                 pte |= ARM_V7S_ATTR_NS_SECTION;
 
-        if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_4GB)
-                pte |= ARM_V7S_ATTR_MTK_4GB;
-
         return pte;
 }
 
@@ -397,7 +440,7 @@ static int arm_v7s_init_pte(struct arm_v7s_io_pgtable *data,
         if (num_entries > 1)
                 pte = arm_v7s_pte_to_cont(pte, lvl);
 
-        pte |= paddr & ARM_V7S_LVL_MASK(lvl);
+        pte |= paddr_to_iopte(paddr, lvl, cfg);
 
         __arm_v7s_set_pte(ptep, pte, num_entries, cfg);
         return 0;
@@ -463,7 +506,7 @@ static int __arm_v7s_map(struct arm_v7s_io_pgtable *data, unsigned long iova,
         }
 
         if (ARM_V7S_PTE_IS_TABLE(pte, lvl)) {
-                cptep = iopte_deref(pte, lvl);
+                cptep = iopte_deref(pte, lvl, data);
         } else if (pte) {
                 /* We require an unmap first */
                 WARN_ON(!selftest_running);
@@ -485,7 +528,8 @@ static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova,
         if (!(prot & (IOMMU_READ | IOMMU_WRITE)))
                 return 0;
 
-        if (WARN_ON(upper_32_bits(iova) || upper_32_bits(paddr)))
+        if (WARN_ON(iova >= (1ULL << data->iop.cfg.ias) ||
+                    paddr >= (1ULL << data->iop.cfg.oas)))
                 return -ERANGE;
 
         ret = __arm_v7s_map(data, iova, paddr, size, prot, 1, data->pgd);
@@ -512,7 +556,8 @@ static void arm_v7s_free_pgtable(struct io_pgtable *iop)
                 arm_v7s_iopte pte = data->pgd[i];
 
                 if (ARM_V7S_PTE_IS_TABLE(pte, 1))
-                        __arm_v7s_free_table(iopte_deref(pte, 1), 2, data);
+                        __arm_v7s_free_table(iopte_deref(pte, 1, data),
+                                             2, data);
         }
         __arm_v7s_free_table(data->pgd, 1, data);
         kmem_cache_destroy(data->l2_tables);
@@ -582,7 +627,7 @@ static size_t arm_v7s_split_blk_unmap(struct arm_v7s_io_pgtable *data,
                 if (!ARM_V7S_PTE_IS_TABLE(pte, 1))
                         return 0;
 
-                tablep = iopte_deref(pte, 1);
+                tablep = iopte_deref(pte, 1, data);
                 return __arm_v7s_unmap(data, gather, iova, size, 2, tablep);
         }
 
@@ -640,7 +685,7 @@ static size_t __arm_v7s_unmap(struct arm_v7s_io_pgtable *data,
                                 /* Also flush any partial walks */
                                 io_pgtable_tlb_flush_walk(iop, iova, blk_size,
                                                 ARM_V7S_BLOCK_SIZE(lvl + 1));
-                                ptep = iopte_deref(pte[i], lvl);
+                                ptep = iopte_deref(pte[i], lvl, data);
                                 __arm_v7s_free_table(ptep, lvl + 1, data);
                         } else if (iop->cfg.quirks & IO_PGTABLE_QUIRK_NON_STRICT) {
                                 /*
@@ -665,7 +710,7 @@ static size_t __arm_v7s_unmap(struct arm_v7s_io_pgtable *data,
         }
 
         /* Keep on walkin' */
-        ptep = iopte_deref(pte[0], lvl);
+        ptep = iopte_deref(pte[0], lvl, data);
         return __arm_v7s_unmap(data, gather, iova, size, lvl + 1, ptep);
 }
 
@@ -691,7 +736,7 @@ static phys_addr_t arm_v7s_iova_to_phys(struct io_pgtable_ops *ops,
         do {
                 ptep += ARM_V7S_LVL_IDX(iova, ++lvl);
                 pte = READ_ONCE(*ptep);
-                ptep = iopte_deref(pte, lvl);
+                ptep = iopte_deref(pte, lvl, data);
         } while (ARM_V7S_PTE_IS_TABLE(pte, lvl));
 
         if (!ARM_V7S_PTE_IS_VALID(pte))
@@ -700,7 +745,7 @@ static phys_addr_t arm_v7s_iova_to_phys(struct io_pgtable_ops *ops,
         mask = ARM_V7S_LVL_MASK(lvl);
         if (arm_v7s_pte_is_cont(pte, lvl))
                 mask *= ARM_V7S_CONT_PAGES;
-        return (pte & mask) | (iova & ~mask);
+        return iopte_to_paddr(pte, lvl, &data->iop.cfg) | (iova & ~mask);
 }
 
 static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
@@ -708,18 +753,21 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
 {
         struct arm_v7s_io_pgtable *data;
 
-        if (cfg->ias > ARM_V7S_ADDR_BITS || cfg->oas > ARM_V7S_ADDR_BITS)
+        if (cfg->ias > ARM_V7S_ADDR_BITS)
+                return NULL;
+
+        if (cfg->oas > (arm_v7s_is_mtk_enabled(cfg) ? 34 : ARM_V7S_ADDR_BITS))
                 return NULL;
 
         if (cfg->quirks & ~(IO_PGTABLE_QUIRK_ARM_NS |
                             IO_PGTABLE_QUIRK_NO_PERMS |
                             IO_PGTABLE_QUIRK_TLBI_ON_MAP |
-                            IO_PGTABLE_QUIRK_ARM_MTK_4GB |
+                            IO_PGTABLE_QUIRK_ARM_MTK_EXT |
                             IO_PGTABLE_QUIRK_NON_STRICT))
                 return NULL;
 
         /* If ARM_MTK_4GB is enabled, the NO_PERMS is also expected. */
-        if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_4GB &&
+        if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT &&
             !(cfg->quirks & IO_PGTABLE_QUIRK_NO_PERMS))
                         return NULL;
 
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 70bfbcc09248..d658c7c6a2ab 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -26,12 +26,10 @@
 
 static struct kset *iommu_group_kset;
 static DEFINE_IDA(iommu_group_ida);
-#ifdef CONFIG_IOMMU_DEFAULT_PASSTHROUGH
-static unsigned int iommu_def_domain_type = IOMMU_DOMAIN_IDENTITY;
-#else
-static unsigned int iommu_def_domain_type = IOMMU_DOMAIN_DMA;
-#endif
+
+static unsigned int iommu_def_domain_type __read_mostly;
 static bool iommu_dma_strict __read_mostly = true;
+static u32 iommu_cmd_line __read_mostly;
 
 struct iommu_group {
         struct kobject kobj;
@@ -68,6 +66,18 @@ static const char * const iommu_group_resv_type_string[] = {
         [IOMMU_RESV_SW_MSI]                     = "msi",
 };
 
+#define IOMMU_CMD_LINE_DMA_API          BIT(0)
+
+static void iommu_set_cmd_line_dma_api(void)
+{
+        iommu_cmd_line |= IOMMU_CMD_LINE_DMA_API;
+}
+
+static bool iommu_cmd_line_dma_api(void)
+{
+        return !!(iommu_cmd_line & IOMMU_CMD_LINE_DMA_API);
+}
+
 #define IOMMU_GROUP_ATTR(_name, _mode, _show, _store)           \
 struct iommu_group_attribute iommu_group_attr_##_name =         \
         __ATTR(_name, _mode, _show, _store)
@@ -80,12 +90,55 @@ struct iommu_group_attribute iommu_group_attr_##_name =		\
 static LIST_HEAD(iommu_device_list);
 static DEFINE_SPINLOCK(iommu_device_lock);
 
+/*
+ * Use a function instead of an array here because the domain-type is a
+ * bit-field, so an array would waste memory.
+ */
+static const char *iommu_domain_type_str(unsigned int t)
+{
+        switch (t) {
+        case IOMMU_DOMAIN_BLOCKED:
+                return "Blocked";
+        case IOMMU_DOMAIN_IDENTITY:
+                return "Passthrough";
+        case IOMMU_DOMAIN_UNMANAGED:
+                return "Unmanaged";
+        case IOMMU_DOMAIN_DMA:
+                return "Translated";
+        default:
+                return "Unknown";
+        }
+}
+
+static int __init iommu_subsys_init(void)
+{
+        bool cmd_line = iommu_cmd_line_dma_api();
+
+        if (!cmd_line) {
+                if (IS_ENABLED(CONFIG_IOMMU_DEFAULT_PASSTHROUGH))
+                        iommu_set_default_passthrough(false);
+                else
+                        iommu_set_default_translated(false);
+
+                if (iommu_default_passthrough() && mem_encrypt_active()) {
+                        pr_info("Memory encryption detected - Disabling default IOMMU Passthrough\n");
+                        iommu_set_default_translated(false);
+                }
+        }
+
+        pr_info("Default domain type: %s %s\n",
+                iommu_domain_type_str(iommu_def_domain_type),
+                cmd_line ? "(set via kernel command line)" : "");
+
+        return 0;
+}
+subsys_initcall(iommu_subsys_init);
+
 int iommu_device_register(struct iommu_device *iommu)
 {
         spin_lock(&iommu_device_lock);
         list_add_tail(&iommu->list, &iommu_device_list);
         spin_unlock(&iommu_device_lock);
-
         return 0;
 }
 
@@ -165,7 +218,11 @@ static int __init iommu_set_def_domain_type(char *str)
         if (ret)
                 return ret;
 
-        iommu_def_domain_type = pt ? IOMMU_DOMAIN_IDENTITY : IOMMU_DOMAIN_DMA;
+        if (pt)
+                iommu_set_default_passthrough(true);
+        else
+                iommu_set_default_translated(true);
+
         return 0;
 }
 early_param("iommu.passthrough", iommu_set_def_domain_type);
@@ -229,60 +286,58 @@ static ssize_t iommu_group_show_name(struct iommu_group *group, char *buf)
  * @new: new region to insert
  * @regions: list of regions
  *
- * The new element is sorted by address with respect to the other
- * regions of the same type. In case it overlaps with another
- * region of the same type, regions are merged. In case it
- * overlaps with another region of different type, regions are
- * not merged.
+ * Elements are sorted by start address and overlapping segments
+ * of the same type are merged.
  */
-static int iommu_insert_resv_region(struct iommu_resv_region *new,
-                                    struct list_head *regions)
+int iommu_insert_resv_region(struct iommu_resv_region *new,
+                             struct list_head *regions)
 {
-        struct iommu_resv_region *region;
-        phys_addr_t start = new->start;
-        phys_addr_t end = new->start + new->length - 1;
-        struct list_head *pos = regions->next;
-
-        while (pos != regions) {
-                struct iommu_resv_region *entry =
-                        list_entry(pos, struct iommu_resv_region, list);
-                phys_addr_t a = entry->start;
-                phys_addr_t b = entry->start + entry->length - 1;
-                int type = entry->type;
-
-                if (end < a) {
-                        goto insert;
-                } else if (start > b) {
-                        pos = pos->next;
-                } else if ((start >= a) && (end <= b)) {
-                        if (new->type == type)
-                                return 0;
-                        else
-                                pos = pos->next;
+        struct iommu_resv_region *iter, *tmp, *nr, *top;
+        LIST_HEAD(stack);
+
+        nr = iommu_alloc_resv_region(new->start, new->length,
+                                     new->prot, new->type);
+        if (!nr)
+                return -ENOMEM;
+
+        /* First add the new element based on start address sorting */
+        list_for_each_entry(iter, regions, list) {
+                if (nr->start < iter->start ||
+                    (nr->start == iter->start && nr->type <= iter->type))
+                        break;
+        }
+        list_add_tail(&nr->list, &iter->list);
+
+        /* Merge overlapping segments of type nr->type in @regions, if any */
+        list_for_each_entry_safe(iter, tmp, regions, list) {
+                phys_addr_t top_end, iter_end = iter->start + iter->length - 1;
+
+                /* no merge needed on elements of different types than @nr */
+                if (iter->type != nr->type) {
+                        list_move_tail(&iter->list, &stack);
+                        continue;
+                }
+
+                /* look for the last stack element of same type as @iter */
+                list_for_each_entry_reverse(top, &stack, list)
+                        if (top->type == iter->type)
+                                goto check_overlap;
+
+                list_move_tail(&iter->list, &stack);
+                continue;
+
+check_overlap:
+                top_end = top->start + top->length - 1;
+
+                if (iter->start > top_end + 1) {
+                        list_move_tail(&iter->list, &stack);
                 } else {
-                        if (new->type == type) {
-                                phys_addr_t new_start = min(a, start);
-                                phys_addr_t new_end = max(b, end);
-                                int ret;
-
-                                list_del(&entry->list);
-                                entry->start = new_start;
-                                entry->length = new_end - new_start + 1;
-                                ret = iommu_insert_resv_region(entry, regions);
-                                kfree(entry);
-                                return ret;
-                        } else {
-                                pos = pos->next;
-                        }
+                        top->length = max(top_end, iter_end) - top->start + 1;
+                        list_del(&iter->list);
+                        kfree(iter);
                 }
         }
-insert:
-        region = iommu_alloc_resv_region(new->start, new->length,
-                                         new->prot, new->type);
-        if (!region)
-                return -ENOMEM;
-
-        list_add_tail(&region->list, pos);
+        list_splice(&stack, regions);
         return 0;
 }
 
@@ -2145,7 +2200,6 @@ request_default_domain_for_dev(struct device *dev, unsigned long type)
 
         mutex_lock(&group->mutex);
 
-        /* Check if the default domain is already direct mapped */
         ret = 0;
         if (group->default_domain && group->default_domain->type == type)
                 goto out;
@@ -2155,7 +2209,6 @@ request_default_domain_for_dev(struct device *dev, unsigned long type)
         if (iommu_group_device_count(group) != 1)
                 goto out;
 
-        /* Allocate a direct mapped domain */
         ret = -ENOMEM;
         domain = __iommu_domain_alloc(dev->bus, type);
         if (!domain)
@@ -2170,7 +2223,7 @@ request_default_domain_for_dev(struct device *dev, unsigned long type)
 
         iommu_group_create_direct_mappings(group, dev);
 
-        /* Make the direct mapped domain the default for this group */
+        /* Make the domain the default for this group */
         if (group->default_domain)
                 iommu_domain_free(group->default_domain);
         group->default_domain = domain;
@@ -2198,6 +2251,28 @@ int iommu_request_dma_domain_for_dev(struct device *dev)
         return request_default_domain_for_dev(dev, IOMMU_DOMAIN_DMA);
 }
 
+void iommu_set_default_passthrough(bool cmd_line)
+{
+        if (cmd_line)
+                iommu_set_cmd_line_dma_api();
+
+        iommu_def_domain_type = IOMMU_DOMAIN_IDENTITY;
+}
+
+void iommu_set_default_translated(bool cmd_line)
+{
+        if (cmd_line)
+                iommu_set_cmd_line_dma_api();
+
+        iommu_def_domain_type = IOMMU_DOMAIN_DMA;
+}
+
+bool iommu_default_passthrough(void)
+{
+        return iommu_def_domain_type == IOMMU_DOMAIN_IDENTITY;
+}
+EXPORT_SYMBOL_GPL(iommu_default_passthrough);
+
 const struct iommu_ops *iommu_ops_from_fwnode(struct fwnode_handle *fwnode)
 {
         const struct iommu_ops *ops = NULL;
diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c
index 3e1a8a675572..41c605b0058f 100644
--- a/drivers/iommu/iova.c
+++ b/drivers/iommu/iova.c
@@ -577,7 +577,9 @@ void queue_iova(struct iova_domain *iovad,
 
         spin_unlock_irqrestore(&fq->lock, flags);
 
-        if (atomic_cmpxchg(&iovad->fq_timer_on, 0, 1) == 0)
+        /* Avoid false sharing as much as possible. */
+        if (!atomic_read(&iovad->fq_timer_on) &&
+            !atomic_cmpxchg(&iovad->fq_timer_on, 0, 1))
                 mod_timer(&iovad->fq_timer,
                           jiffies + msecs_to_jiffies(IOVA_FQ_TIMEOUT));
 }
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index 76a8ec343d53..9da8309f7170 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -49,6 +49,7 @@ struct ipmmu_features {
         bool setup_imbuscr;
         bool twobit_imttbcr_sl0;
         bool reserved_context;
+        bool cache_snoop;
 };
 
 struct ipmmu_vmsa_device {
@@ -115,45 +116,44 @@ static struct ipmmu_vmsa_device *to_ipmmu(struct device *dev)
 #define IMTTBCR                         0x0008
 #define IMTTBCR_EAE                     (1 << 31)
 #define IMTTBCR_PMB                     (1 << 30)
-#define IMTTBCR_SH1_NON_SHAREABLE       (0 << 28)
-#define IMTTBCR_SH1_OUTER_SHAREABLE     (2 << 28)
-#define IMTTBCR_SH1_INNER_SHAREABLE     (3 << 28)
-#define IMTTBCR_SH1_MASK                (3 << 28)
-#define IMTTBCR_ORGN1_NC                (0 << 26)
-#define IMTTBCR_ORGN1_WB_WA             (1 << 26)
-#define IMTTBCR_ORGN1_WT                (2 << 26)
-#define IMTTBCR_ORGN1_WB                (3 << 26)
-#define IMTTBCR_ORGN1_MASK              (3 << 26)
-#define IMTTBCR_IRGN1_NC                (0 << 24)
-#define IMTTBCR_IRGN1_WB_WA             (1 << 24)
-#define IMTTBCR_IRGN1_WT                (2 << 24)
-#define IMTTBCR_IRGN1_WB                (3 << 24)
-#define IMTTBCR_IRGN1_MASK              (3 << 24)
+#define IMTTBCR_SH1_NON_SHAREABLE       (0 << 28)       /* R-Car Gen2 only */
+#define IMTTBCR_SH1_OUTER_SHAREABLE     (2 << 28)       /* R-Car Gen2 only */
+#define IMTTBCR_SH1_INNER_SHAREABLE     (3 << 28)       /* R-Car Gen2 only */
+#define IMTTBCR_SH1_MASK                (3 << 28)       /* R-Car Gen2 only */
+#define IMTTBCR_ORGN1_NC                (0 << 26)       /* R-Car Gen2 only */
+#define IMTTBCR_ORGN1_WB_WA             (1 << 26)       /* R-Car Gen2 only */
+#define IMTTBCR_ORGN1_WT                (2 << 26)       /* R-Car Gen2 only */
+#define IMTTBCR_ORGN1_WB                (3 << 26)       /* R-Car Gen2 only */
+#define IMTTBCR_ORGN1_MASK              (3 << 26)       /* R-Car Gen2 only */
+#define IMTTBCR_IRGN1_NC                (0 << 24)       /* R-Car Gen2 only */
+#define IMTTBCR_IRGN1_WB_WA             (1 << 24)       /* R-Car Gen2 only */
+#define IMTTBCR_IRGN1_WT                (2 << 24)       /* R-Car Gen2 only */
+#define IMTTBCR_IRGN1_WB                (3 << 24)       /* R-Car Gen2 only */
+#define IMTTBCR_IRGN1_MASK              (3 << 24)       /* R-Car Gen2 only */
 #define IMTTBCR_TSZ1_MASK               (7 << 16)
 #define IMTTBCR_TSZ1_SHIFT              16
-#define IMTTBCR_SH0_NON_SHAREABLE       (0 << 12)
-#define IMTTBCR_SH0_OUTER_SHAREABLE     (2 << 12)
-#define IMTTBCR_SH0_INNER_SHAREABLE     (3 << 12)
-#define IMTTBCR_SH0_MASK                (3 << 12)
-#define IMTTBCR_ORGN0_NC                (0 << 10)
-#define IMTTBCR_ORGN0_WB_WA             (1 << 10)
-#define IMTTBCR_ORGN0_WT                (2 << 10)
-#define IMTTBCR_ORGN0_WB                (3 << 10)
-#define IMTTBCR_ORGN0_MASK              (3 << 10)
-#define IMTTBCR_IRGN0_NC                (0 << 8)
-#define IMTTBCR_IRGN0_WB_WA             (1 << 8)
-#define IMTTBCR_IRGN0_WT                (2 << 8)
-#define IMTTBCR_IRGN0_WB                (3 << 8)
-#define IMTTBCR_IRGN0_MASK              (3 << 8)
+#define IMTTBCR_SH0_NON_SHAREABLE       (0 << 12)       /* R-Car Gen2 only */
+#define IMTTBCR_SH0_OUTER_SHAREABLE     (2 << 12)       /* R-Car Gen2 only */
+#define IMTTBCR_SH0_INNER_SHAREABLE     (3 << 12)       /* R-Car Gen2 only */
+#define IMTTBCR_SH0_MASK                (3 << 12)       /* R-Car Gen2 only */
+#define IMTTBCR_ORGN0_NC                (0 << 10)       /* R-Car Gen2 only */
+#define IMTTBCR_ORGN0_WB_WA             (1 << 10)       /* R-Car Gen2 only */
+#define IMTTBCR_ORGN0_WT                (2 << 10)       /* R-Car Gen2 only */
+#define IMTTBCR_ORGN0_WB                (3 << 10)       /* R-Car Gen2 only */
+#define IMTTBCR_ORGN0_MASK              (3 << 10)       /* R-Car Gen2 only */
+#define IMTTBCR_IRGN0_NC                (0 << 8)        /* R-Car Gen2 only */
+#define IMTTBCR_IRGN0_WB_WA             (1 << 8)        /* R-Car Gen2 only */
+#define IMTTBCR_IRGN0_WT                (2 << 8)        /* R-Car Gen2 only */
+#define IMTTBCR_IRGN0_WB                (3 << 8)        /* R-Car Gen2 only */
+#define IMTTBCR_IRGN0_MASK              (3 << 8)        /* R-Car Gen2 only */
+#define IMTTBCR_SL0_TWOBIT_LVL_3        (0 << 6)        /* R-Car Gen3 only */
+#define IMTTBCR_SL0_TWOBIT_LVL_2        (1 << 6)        /* R-Car Gen3 only */
+#define IMTTBCR_SL0_TWOBIT_LVL_1        (2 << 6)        /* R-Car Gen3 only */
 #define IMTTBCR_SL0_LVL_2               (0 << 4)
 #define IMTTBCR_SL0_LVL_1               (1 << 4)
 #define IMTTBCR_TSZ0_MASK               (7 << 0)
 #define IMTTBCR_TSZ0_SHIFT              O
 
-#define IMTTBCR_SL0_TWOBIT_LVL_3        (0 << 6)
-#define IMTTBCR_SL0_TWOBIT_LVL_2        (1 << 6)
-#define IMTTBCR_SL0_TWOBIT_LVL_1        (2 << 6)
-
 #define IMBUSCR                         0x000c
 #define IMBUSCR_DVM                     (1 << 2)
 #define IMBUSCR_BUSSEL_SYS              (0 << 0)
@@ -422,17 +422,19 @@ static void ipmmu_domain_setup_context(struct ipmmu_vmsa_domain *domain)
 
         /*
          * TTBCR
-         * We use long descriptors with inner-shareable WBWA tables and allocate
-         * the whole 32-bit VA space to TTBR0.
+         * We use long descriptors and allocate the whole 32-bit VA space to
+         * TTBR0.
          */
         if (domain->mmu->features->twobit_imttbcr_sl0)
                 tmp = IMTTBCR_SL0_TWOBIT_LVL_1;
         else
                 tmp = IMTTBCR_SL0_LVL_1;
 
-        ipmmu_ctx_write_root(domain, IMTTBCR, IMTTBCR_EAE |
-                             IMTTBCR_SH0_INNER_SHAREABLE | IMTTBCR_ORGN0_WB_WA |
-                             IMTTBCR_IRGN0_WB_WA | tmp);
+        if (domain->mmu->features->cache_snoop)
+                tmp |= IMTTBCR_SH0_INNER_SHAREABLE | IMTTBCR_ORGN0_WB_WA |
+                       IMTTBCR_IRGN0_WB_WA;
+
+        ipmmu_ctx_write_root(domain, IMTTBCR, IMTTBCR_EAE | tmp);
 
         /* MAIR0 */
         ipmmu_ctx_write_root(domain, IMMAIR0,
@@ -994,6 +996,7 @@ static const struct ipmmu_features ipmmu_features_default = {
         .setup_imbuscr = true,
         .twobit_imttbcr_sl0 = false,
         .reserved_context = false,
+        .cache_snoop = true,
 };
 
 static const struct ipmmu_features ipmmu_features_rcar_gen3 = {
@@ -1004,6 +1007,7 @@ static const struct ipmmu_features ipmmu_features_rcar_gen3 = {
         .setup_imbuscr = false,
         .twobit_imttbcr_sl0 = true,
         .reserved_context = true,
+        .cache_snoop = false,
 };
 
 static const struct of_device_id ipmmu_of_ids[] = {
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 4c0be5b75c28..be99d408cf35 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -766,7 +766,6 @@ static int msm_iommu_probe(struct platform_device *pdev)
 
         iommu->irq = platform_get_irq(pdev, 0);
         if (iommu->irq < 0) {
-                dev_err(iommu->dev, "could not get iommu irq\n");
                 ret = -ENODEV;
                 goto fail;
         }
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 0827d51936fa..67a483c1a935 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -28,6 +28,7 @@
 #include "mtk_iommu.h"
 
 #define REG_MMU_PT_BASE_ADDR                    0x000
+#define MMU_PT_ADDR_MASK                        GENMASK(31, 7)
 
 #define REG_MMU_INVALIDATE                      0x020
 #define F_ALL_INVLD                             0x2
@@ -44,12 +45,9 @@
 #define REG_MMU_DCM_DIS                         0x050
 
 #define REG_MMU_CTRL_REG                        0x110
+#define F_MMU_TF_PROT_TO_PROGRAM_ADDR           (2 << 4)
 #define F_MMU_PREFETCH_RT_REPLACE_MOD           BIT(4)
-#define F_MMU_TF_PROTECT_SEL_SHIFT(data) \
-        ((data)->m4u_plat == M4U_MT2712 ? 4 : 5)
-/* It's named by F_MMU_TF_PROT_SEL in mt2712. */
-#define F_MMU_TF_PROTECT_SEL(prot, data) \
-        (((prot) & 0x3) << F_MMU_TF_PROTECT_SEL_SHIFT(data))
+#define F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173    (2 << 5)
 
 #define REG_MMU_IVRP_PADDR                      0x114
 
@@ -66,26 +64,32 @@
 #define F_INT_CLR_BIT                           BIT(12)
 
 #define REG_MMU_INT_MAIN_CONTROL                0x124
-#define F_INT_TRANSLATION_FAULT                 BIT(0)
-#define F_INT_MAIN_MULTI_HIT_FAULT              BIT(1)
-#define F_INT_INVALID_PA_FAULT                  BIT(2)
-#define F_INT_ENTRY_REPLACEMENT_FAULT           BIT(3)
-#define F_INT_TLB_MISS_FAULT                    BIT(4)
-#define F_INT_MISS_TRANSACTION_FIFO_FAULT       BIT(5)
-#define F_INT_PRETETCH_TRANSATION_FIFO_FAULT    BIT(6)
+                                                /* mmu0 | mmu1 */
+#define F_INT_TRANSLATION_FAULT                 (BIT(0) | BIT(7))
+#define F_INT_MAIN_MULTI_HIT_FAULT              (BIT(1) | BIT(8))
+#define F_INT_INVALID_PA_FAULT                  (BIT(2) | BIT(9))
+#define F_INT_ENTRY_REPLACEMENT_FAULT           (BIT(3) | BIT(10))
+#define F_INT_TLB_MISS_FAULT                    (BIT(4) | BIT(11))
+#define F_INT_MISS_TRANSACTION_FIFO_FAULT       (BIT(5) | BIT(12))
+#define F_INT_PRETETCH_TRANSATION_FIFO_FAULT    (BIT(6) | BIT(13))
 
 #define REG_MMU_CPE_DONE                        0x12C
 
 #define REG_MMU_FAULT_ST1                       0x134
+#define F_REG_MMU0_FAULT_MASK                   GENMASK(6, 0)
+#define F_REG_MMU1_FAULT_MASK                   GENMASK(13, 7)
 
-#define REG_MMU_FAULT_VA                        0x13c
+#define REG_MMU0_FAULT_VA                       0x13c
 #define F_MMU_FAULT_VA_WRITE_BIT                BIT(1)
 #define F_MMU_FAULT_VA_LAYER_BIT                BIT(0)
 
-#define REG_MMU_INVLD_PA                        0x140
-#define REG_MMU_INT_ID                          0x150
-#define F_MMU0_INT_ID_LARB_ID(a)                (((a) >> 7) & 0x7)
-#define F_MMU0_INT_ID_PORT_ID(a)                (((a) >> 2) & 0x1f)
+#define REG_MMU0_INVLD_PA                       0x140
+#define REG_MMU1_FAULT_VA                       0x144
+#define REG_MMU1_INVLD_PA                       0x148
+#define REG_MMU0_INT_ID                         0x150
+#define REG_MMU1_INT_ID                         0x154
+#define F_MMU_INT_ID_LARB_ID(a)                 (((a) >> 7) & 0x7)
+#define F_MMU_INT_ID_PORT_ID(a)                 (((a) >> 2) & 0x1f)
 
 #define MTK_PROTECT_PA_ALIGN                    128
 
@@ -107,6 +111,30 @@ struct mtk_iommu_domain {
 
 static const struct iommu_ops mtk_iommu_ops;
 
+/*
+ * In M4U 4GB mode, the physical address is remapped as below:
+ *
+ * CPU Physical address:
+ * ====================
+ *
+ * 0      1G       2G     3G       4G     5G
+ * |---A---|---B---|---C---|---D---|---E---|
+ * +--I/O--+------------Memory-------------+
+ *
+ * IOMMU output physical address:
+ *  =============================
+ *
+ *                                 4G      5G     6G      7G      8G
+ *                                 |---E---|---B---|---C---|---D---|
+ *                                 +------------Memory-------------+
+ *
+ * The Region 'A'(I/O) can NOT be mapped by M4U; For Region 'B'/'C'/'D', the
+ * bit32 of the CPU physical address always is needed to set, and for Region
+ * 'E', the CPU physical address keep as is.
+ * Additionally, The iommu consumers always use the CPU phyiscal address.
+ */
+#define MTK_IOMMU_4GB_MODE_REMAP_BASE    0x140000000UL
+
 static LIST_HEAD(m4ulist);      /* List all the M4U HWs */
 
 #define for_each_m4u(data)      list_for_each_entry(data, &m4ulist, list)
@@ -226,13 +254,21 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id)
 
         /* Read error info from registers */
         int_state = readl_relaxed(data->base + REG_MMU_FAULT_ST1);
-        fault_iova = readl_relaxed(data->base + REG_MMU_FAULT_VA);
+        if (int_state & F_REG_MMU0_FAULT_MASK) {
+                regval = readl_relaxed(data->base + REG_MMU0_INT_ID);
+                fault_iova = readl_relaxed(data->base + REG_MMU0_FAULT_VA);
+                fault_pa = readl_relaxed(data->base + REG_MMU0_INVLD_PA);
+        } else {
+                regval = readl_relaxed(data->base + REG_MMU1_INT_ID);
+                fault_iova = readl_relaxed(data->base + REG_MMU1_FAULT_VA);
+                fault_pa = readl_relaxed(data->base + REG_MMU1_INVLD_PA);
+        }
         layer = fault_iova & F_MMU_FAULT_VA_LAYER_BIT;
         write = fault_iova & F_MMU_FAULT_VA_WRITE_BIT;
-        fault_pa = readl_relaxed(data->base + REG_MMU_INVLD_PA);
-        regval = readl_relaxed(data->base + REG_MMU_INT_ID);
-        fault_larb = F_MMU0_INT_ID_LARB_ID(regval);
-        fault_port = F_MMU0_INT_ID_PORT_ID(regval);
+        fault_larb = F_MMU_INT_ID_LARB_ID(regval);
+        fault_port = F_MMU_INT_ID_PORT_ID(regval);
+
+        fault_larb = data->plat_data->larbid_remap[fault_larb];
 
         if (report_iommu_fault(&dom->domain, data->dev, fault_iova,
                                write ? IOMMU_FAULT_WRITE : IOMMU_FAULT_READ)) {
@@ -264,7 +300,7 @@ static void mtk_iommu_config(struct mtk_iommu_data *data,
         for (i = 0; i < fwspec->num_ids; ++i) {
                 larbid = MTK_M4U_TO_LARB(fwspec->ids[i]);
                 portid = MTK_M4U_TO_PORT(fwspec->ids[i]);
-                larb_mmu = &data->smi_imu.larb_imu[larbid];
+                larb_mmu = &data->larb_imu[larbid];
 
                 dev_dbg(dev, "%s iommu port: %d\n",
                         enable ? "enable" : "disable", portid);
@@ -285,17 +321,15 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom)
         dom->cfg = (struct io_pgtable_cfg) {
                 .quirks = IO_PGTABLE_QUIRK_ARM_NS |
                         IO_PGTABLE_QUIRK_NO_PERMS |
-                        IO_PGTABLE_QUIRK_TLBI_ON_MAP,
+                        IO_PGTABLE_QUIRK_TLBI_ON_MAP |
+                        IO_PGTABLE_QUIRK_ARM_MTK_EXT,
                 .pgsize_bitmap = mtk_iommu_ops.pgsize_bitmap,
                 .ias = 32,
-                .oas = 32,
+                .oas = 34,
                 .tlb = &mtk_iommu_flush_ops,
                 .iommu_dev = data->dev,
         };
 
-        if (data->enable_4GB)
-                dom->cfg.quirks |= IO_PGTABLE_QUIRK_ARM_MTK_4GB;
-
         dom->iop = alloc_io_pgtable_ops(ARM_V7S, &dom->cfg, data);
         if (!dom->iop) {
                 dev_err(data->dev, "Failed to alloc io pgtable\n");
@@ -358,7 +392,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
         /* Update the pgtable base address register of the M4U HW */
         if (!data->m4u_dom) {
                 data->m4u_dom = dom;
-                writel(dom->cfg.arm_v7s_cfg.ttbr[0],
+                writel(dom->cfg.arm_v7s_cfg.ttbr[0] & MMU_PT_ADDR_MASK,
                        data->base + REG_MMU_PT_BASE_ADDR);
         }
 
@@ -381,12 +415,16 @@ static int mtk_iommu_map(struct iommu_domain *domain, unsigned long iova,
                          phys_addr_t paddr, size_t size, int prot)
 {
         struct mtk_iommu_domain *dom = to_mtk_domain(domain);
+        struct mtk_iommu_data *data = mtk_iommu_get_m4u_data();
         unsigned long flags;
         int ret;
 
+        /* The "4GB mode" M4U physically can not use the lower remap of Dram. */
+        if (data->enable_4GB)
+                paddr |= BIT_ULL(32);
+
         spin_lock_irqsave(&dom->pgtlock, flags);
-        ret = dom->iop->map(dom->iop, iova, paddr & DMA_BIT_MASK(32),
-                            size, prot);
+        ret = dom->iop->map(dom->iop, iova, paddr, size, prot);
         spin_unlock_irqrestore(&dom->pgtlock, flags);
 
         return ret;
@@ -430,8 +468,8 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,
         pa = dom->iop->iova_to_phys(dom->iop, iova);
         spin_unlock_irqrestore(&dom->pgtlock, flags);
 
-        if (data->enable_4GB)
-                pa |= BIT_ULL(32);
+        if (data->enable_4GB && pa >= MTK_IOMMU_4GB_MODE_REMAP_BASE)
+                pa &= ~BIT_ULL(32);
 
         return pa;
 }
@@ -540,9 +578,11 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)
                 return ret;
         }
 
-        regval = F_MMU_TF_PROTECT_SEL(2, data);
-        if (data->m4u_plat == M4U_MT8173)
-                regval |= F_MMU_PREFETCH_RT_REPLACE_MOD;
+        if (data->plat_data->m4u_plat == M4U_MT8173)
+                regval = F_MMU_PREFETCH_RT_REPLACE_MOD |
+                         F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173;
+        else
+                regval = F_MMU_TF_PROT_TO_PROGRAM_ADDR;
         writel_relaxed(regval, data->base + REG_MMU_CTRL_REG);
 
         regval = F_L2_MULIT_HIT_EN |
@@ -562,14 +602,14 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)
                 F_INT_PRETETCH_TRANSATION_FIFO_FAULT;
         writel_relaxed(regval, data->base + REG_MMU_INT_MAIN_CONTROL);
 
-        if (data->m4u_plat == M4U_MT8173)
+        if (data->plat_data->m4u_plat == M4U_MT8173)
                 regval = (data->protect_base >> 1) | (data->enable_4GB << 31);
         else
                 regval = lower_32_bits(data->protect_base) |
                          upper_32_bits(data->protect_base);
         writel_relaxed(regval, data->base + REG_MMU_IVRP_PADDR);
 
-        if (data->enable_4GB && data->m4u_plat != M4U_MT8173) {
+        if (data->enable_4GB && data->plat_data->has_vld_pa_rng) {
                 /*
                  * If 4GB mode is enabled, the validate PA range is from
                  * 0x1_0000_0000 to 0x1_ffff_ffff. here record bit[32:30].
@@ -579,8 +619,7 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)
         }
         writel_relaxed(0, data->base + REG_MMU_DCM_DIS);
 
-        /* It's MISC control register whose default value is ok except mt8173.*/
-        if (data->m4u_plat == M4U_MT8173)
+        if (data->plat_data->reset_axi)
                 writel_relaxed(0, data->base + REG_MMU_STANDARD_AXI_MODE);
 
         if (devm_request_irq(data->dev, data->irq, mtk_iommu_isr, 0,
@@ -613,7 +652,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)
         if (!data)
                 return -ENOMEM;
         data->dev = dev;
-        data->m4u_plat = (enum mtk_iommu_plat)of_device_get_match_data(dev);
+        data->plat_data = of_device_get_match_data(dev);
 
         /* Protect memory. HW will access here while translation fault.*/
         protect = devm_kzalloc(dev, MTK_PROTECT_PA_ALIGN * 2, GFP_KERNEL);
@@ -623,6 +662,8 @@ static int mtk_iommu_probe(struct platform_device *pdev)
 
         /* Whether the current dram is over 4GB */
         data->enable_4GB = !!(max_pfn > (BIT_ULL(32) >> PAGE_SHIFT));
+        if (!data->plat_data->has_4gb_mode)
+                data->enable_4GB = false;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         data->base = devm_ioremap_resource(dev, res);
@@ -634,15 +675,16 @@ static int mtk_iommu_probe(struct platform_device *pdev)
         if (data->irq < 0)
                 return data->irq;
 
-        data->bclk = devm_clk_get(dev, "bclk");
-        if (IS_ERR(data->bclk))
-                return PTR_ERR(data->bclk);
+        if (data->plat_data->has_bclk) {
+                data->bclk = devm_clk_get(dev, "bclk");
+                if (IS_ERR(data->bclk))
+                        return PTR_ERR(data->bclk);
+        }
 
         larb_nr = of_count_phandle_with_args(dev->of_node,
                                              "mediatek,larbs", NULL);
         if (larb_nr < 0)
                 return larb_nr;
-        data->smi_imu.larb_nr = larb_nr;
 
         for (i = 0; i < larb_nr; i++) {
                 struct device_node *larbnode;
@@ -667,7 +709,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)
                         of_node_put(larbnode);
                         return -EPROBE_DEFER;
                 }
-                data->smi_imu.larb_imu[id].dev = &plarbdev->dev;
+                data->larb_imu[id].dev = &plarbdev->dev;
 
                 component_match_add_release(dev, &match, release_of,
                                             compare_of, larbnode);
@@ -728,6 +770,7 @@ static int __maybe_unused mtk_iommu_suspend(struct device *dev)
         reg->int_control0 = readl_relaxed(base + REG_MMU_INT_CONTROL0);
         reg->int_main_control = readl_relaxed(base + REG_MMU_INT_MAIN_CONTROL);
         reg->ivrp_paddr = readl_relaxed(base + REG_MMU_IVRP_PADDR);
+        reg->vld_pa_rng = readl_relaxed(base + REG_MMU_VLD_PA_RNG);
         clk_disable_unprepare(data->bclk);
         return 0;
 }
@@ -736,6 +779,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)
 {
         struct mtk_iommu_data *data = dev_get_drvdata(dev);
         struct mtk_iommu_suspend_reg *reg = &data->reg;
+        struct mtk_iommu_domain *m4u_dom = data->m4u_dom;
         void __iomem *base = data->base;
         int ret;
 
@@ -751,8 +795,9 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)
         writel_relaxed(reg->int_control0, base + REG_MMU_INT_CONTROL0);
         writel_relaxed(reg->int_main_control, base + REG_MMU_INT_MAIN_CONTROL);
         writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR);
-        if (data->m4u_dom)
-                writel(data->m4u_dom->cfg.arm_v7s_cfg.ttbr[0],
+        writel_relaxed(reg->vld_pa_rng, base + REG_MMU_VLD_PA_RNG);
+        if (m4u_dom)
+                writel(m4u_dom->cfg.arm_v7s_cfg.ttbr[0] & MMU_PT_ADDR_MASK,
                        base + REG_MMU_PT_BASE_ADDR);
         return 0;
 }
@@ -761,9 +806,32 @@ static const struct dev_pm_ops mtk_iommu_pm_ops = {
         SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_iommu_suspend, mtk_iommu_resume)
 };
 
+static const struct mtk_iommu_plat_data mt2712_data = {
+        .m4u_plat     = M4U_MT2712,
+        .has_4gb_mode = true,
+        .has_bclk     = true,
+        .has_vld_pa_rng   = true,
+        .larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
+};
+
+static const struct mtk_iommu_plat_data mt8173_data = {
+        .m4u_plat     = M4U_MT8173,
+        .has_4gb_mode = true,
+        .has_bclk     = true,
+        .reset_axi    = true,
+        .larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */
+};
+
+static const struct mtk_iommu_plat_data mt8183_data = {
+        .m4u_plat     = M4U_MT8183,
+        .reset_axi    = true,
+        .larbid_remap = {0, 4, 5, 6, 7, 2, 3, 1},
+};
+
 static const struct of_device_id mtk_iommu_of_ids[] = {
-        { .compatible = "mediatek,mt2712-m4u", .data = (void *)M4U_MT2712},
-        { .compatible = "mediatek,mt8173-m4u", .data = (void *)M4U_MT8173},
+        { .compatible = "mediatek,mt2712-m4u", .data = &mt2712_data},
+        { .compatible = "mediatek,mt8173-m4u", .data = &mt8173_data},
+        { .compatible = "mediatek,mt8183-m4u", .data = &mt8183_data},
         {}
 };
 
diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h
index 59337323db58..fc0f16eabacd 100644
--- a/drivers/iommu/mtk_iommu.h
+++ b/drivers/iommu/mtk_iommu.h
@@ -24,12 +24,25 @@ struct mtk_iommu_suspend_reg {
         u32                             int_control0;
         u32                             int_main_control;
         u32                             ivrp_paddr;
+        u32                             vld_pa_rng;
 };
 
 enum mtk_iommu_plat {
         M4U_MT2701,
         M4U_MT2712,
         M4U_MT8173,
+        M4U_MT8183,
+};
+
+struct mtk_iommu_plat_data {
+        enum mtk_iommu_plat m4u_plat;
+        bool                has_4gb_mode;
+
+        /* HW will use the EMI clock if there isn't the "bclk". */
+        bool                has_bclk;
+        bool                has_vld_pa_rng;
+        bool                reset_axi;
+        unsigned char       larbid_remap[MTK_LARB_NR_MAX];
 };
 
 struct mtk_iommu_domain;
@@ -43,14 +56,14 @@ struct mtk_iommu_data {
         struct mtk_iommu_suspend_reg    reg;
         struct mtk_iommu_domain         *m4u_dom;
         struct iommu_group              *m4u_group;
-        struct mtk_smi_iommu            smi_imu;      /* SMI larb iommu info */
         bool                            enable_4GB;
         bool                            tlb_flush_active;
 
         struct iommu_device             iommu;
-        enum mtk_iommu_plat             m4u_plat;
+        const struct mtk_iommu_plat_data *plat_data;
 
         struct list_head                list;
+        struct mtk_smi_larb_iommu       larb_imu[MTK_LARB_NR_MAX];
 };
 
 static inline int compare_of(struct device *dev, void *data)
@@ -67,14 +80,14 @@ static inline int mtk_iommu_bind(struct device *dev)
 {
         struct mtk_iommu_data *data = dev_get_drvdata(dev);
 
-        return component_bind_all(dev, &data->smi_imu);
+        return component_bind_all(dev, &data->larb_imu);
 }
 
 static inline void mtk_iommu_unbind(struct device *dev)
 {
         struct mtk_iommu_data *data = dev_get_drvdata(dev);
 
-        component_unbind_all(dev, &data->smi_imu);
+        component_unbind_all(dev, &data->larb_imu);
 }
 
 #endif
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index 7b92ddd5d9fd..210b1c7c0bda 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -206,7 +206,7 @@ static void mtk_iommu_config(struct mtk_iommu_data *data,
         for (i = 0; i < fwspec->num_ids; ++i) {
                 larbid = mt2701_m4u_to_larb(fwspec->ids[i]);
                 portid = mt2701_m4u_to_port(fwspec->ids[i]);
-                larb_mmu = &data->smi_imu.larb_imu[larbid];
+                larb_mmu = &data->larb_imu[larbid];
 
                 dev_dbg(dev, "%s iommu port: %d\n",
                         enable ? "enable" : "disable", portid);
@@ -611,14 +611,12 @@ static int mtk_iommu_probe(struct platform_device *pdev)
                         }
                 }
 
-                data->smi_imu.larb_imu[larb_nr].dev = &plarbdev->dev;
+                data->larb_imu[larb_nr].dev = &plarbdev->dev;
                 component_match_add_release(dev, &match, release_of,
                                             compare_of, larb_spec.np);
                 larb_nr++;
         }
 
-        data->smi_imu.larb_nr = larb_nr;
-
         platform_set_drvdata(pdev, data);
 
         ret = mtk_iommu_hw_init(data);
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 8039bc5ee425..09c6e1c680db 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -35,6 +35,15 @@
 
 static const struct iommu_ops omap_iommu_ops;
 
+struct orphan_dev {
+        struct device *dev;
+        struct list_head node;
+};
+
+static LIST_HEAD(orphan_dev_list);
+
+static DEFINE_SPINLOCK(orphan_lock);
+
 #define to_iommu(dev)   ((struct omap_iommu *)dev_get_drvdata(dev))
 
 /* bitmap of the page sizes currently supported */
@@ -53,6 +62,8 @@ static const struct iommu_ops omap_iommu_ops;
 static struct platform_driver omap_iommu_driver;
 static struct kmem_cache *iopte_cachep;
 
+static int _omap_iommu_add_device(struct device *dev);
+
 /**
  * to_omap_domain - Get struct omap_iommu_domain from generic iommu_domain
  * @dom:        generic iommu domain handle
@@ -65,6 +76,9 @@ static struct omap_iommu_domain *to_omap_domain(struct iommu_domain *dom)
 /**
  * omap_iommu_save_ctx - Save registers for pm off-mode support
  * @dev:        client device
+ *
+ * This should be treated as an deprecated API. It is preserved only
+ * to maintain existing functionality for OMAP3 ISP driver.
  **/
 void omap_iommu_save_ctx(struct device *dev)
 {
@@ -92,6 +106,9 @@ EXPORT_SYMBOL_GPL(omap_iommu_save_ctx);
 /**
  * omap_iommu_restore_ctx - Restore registers for pm off-mode support
  * @dev:        client device
+ *
+ * This should be treated as an deprecated API. It is preserved only
+ * to maintain existing functionality for OMAP3 ISP driver.
  **/
 void omap_iommu_restore_ctx(struct device *dev)
 {
@@ -186,36 +203,18 @@ static void omap2_iommu_disable(struct omap_iommu *obj)
 
 static int iommu_enable(struct omap_iommu *obj)
 {
-        int err;
-        struct platform_device *pdev = to_platform_device(obj->dev);
-        struct iommu_platform_data *pdata = dev_get_platdata(&pdev->dev);
-
-        if (pdata && pdata->deassert_reset) {
-                err = pdata->deassert_reset(pdev, pdata->reset_name);
-                if (err) {
-                        dev_err(obj->dev, "deassert_reset failed: %d\n", err);
-                        return err;
-                }
-        }
-
-        pm_runtime_get_sync(obj->dev);
+        int ret;
 
-        err = omap2_iommu_enable(obj);
+        ret = pm_runtime_get_sync(obj->dev);
+        if (ret < 0)
+                pm_runtime_put_noidle(obj->dev);
 
-        return err;
+        return ret < 0 ? ret : 0;
 }
 
 static void iommu_disable(struct omap_iommu *obj)
 {
-        struct platform_device *pdev = to_platform_device(obj->dev);
-        struct iommu_platform_data *pdata = dev_get_platdata(&pdev->dev);
-
-        omap2_iommu_disable(obj);
-
         pm_runtime_put_sync(obj->dev);
-
-        if (pdata && pdata->assert_reset)
-                pdata->assert_reset(pdev, pdata->reset_name);
 }
 
 /*
@@ -901,15 +900,219 @@ static void omap_iommu_detach(struct omap_iommu *obj)
 
         dma_unmap_single(obj->dev, obj->pd_dma, IOPGD_TABLE_SIZE,
                          DMA_TO_DEVICE);
-        iommu_disable(obj);
         obj->pd_dma = 0;
         obj->iopgd = NULL;
+        iommu_disable(obj);
 
         spin_unlock(&obj->iommu_lock);
 
         dev_dbg(obj->dev, "%s: %s\n", __func__, obj->name);
 }
 
+static void omap_iommu_save_tlb_entries(struct omap_iommu *obj)
+{
+        struct iotlb_lock lock;
+        struct cr_regs cr;
+        struct cr_regs *tmp;
+        int i;
+
+        /* check if there are any locked tlbs to save */
+        iotlb_lock_get(obj, &lock);
+        obj->num_cr_ctx = lock.base;
+        if (!obj->num_cr_ctx)
+                return;
+
+        tmp = obj->cr_ctx;
+        for_each_iotlb_cr(obj, obj->num_cr_ctx, i, cr)
+                * tmp++ = cr;
+}
+
+static void omap_iommu_restore_tlb_entries(struct omap_iommu *obj)
+{
+        struct iotlb_lock l;
+        struct cr_regs *tmp;
+        int i;
+
+        /* no locked tlbs to restore */
+        if (!obj->num_cr_ctx)
+                return;
+
+        l.base = 0;
+        tmp = obj->cr_ctx;
+        for (i = 0; i < obj->num_cr_ctx; i++, tmp++) {
+                l.vict = i;
+                iotlb_lock_set(obj, &l);
+                iotlb_load_cr(obj, tmp);
+        }
+        l.base = obj->num_cr_ctx;
+        l.vict = i;
+        iotlb_lock_set(obj, &l);
+}
+
+/**
+ * omap_iommu_domain_deactivate - deactivate attached iommu devices
+ * @domain: iommu domain attached to the target iommu device
+ *
+ * This API allows the client devices of IOMMU devices to suspend
+ * the IOMMUs they control at runtime, after they are idled and
+ * suspended all activity. System Suspend will leverage the PM
+ * driver late callbacks.
+ **/
+int omap_iommu_domain_deactivate(struct iommu_domain *domain)
+{
+        struct omap_iommu_domain *omap_domain = to_omap_domain(domain);
+        struct omap_iommu_device *iommu;
+        struct omap_iommu *oiommu;
+        int i;
+
+        if (!omap_domain->dev)
+                return 0;
+
+        iommu = omap_domain->iommus;
+        iommu += (omap_domain->num_iommus - 1);
+        for (i = 0; i < omap_domain->num_iommus; i++, iommu--) {
+                oiommu = iommu->iommu_dev;
+                pm_runtime_put_sync(oiommu->dev);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(omap_iommu_domain_deactivate);
+
+/**
+ * omap_iommu_domain_activate - activate attached iommu devices
+ * @domain: iommu domain attached to the target iommu device
+ *
+ * This API allows the client devices of IOMMU devices to resume the
+ * IOMMUs they control at runtime, before they can resume operations.
+ * System Resume will leverage the PM driver late callbacks.
+ **/
+int omap_iommu_domain_activate(struct iommu_domain *domain)
+{
+        struct omap_iommu_domain *omap_domain = to_omap_domain(domain);
+        struct omap_iommu_device *iommu;
+        struct omap_iommu *oiommu;
+        int i;
+
+        if (!omap_domain->dev)
+                return 0;
+
+        iommu = omap_domain->iommus;
+        for (i = 0; i < omap_domain->num_iommus; i++, iommu++) {
+                oiommu = iommu->iommu_dev;
+                pm_runtime_get_sync(oiommu->dev);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(omap_iommu_domain_activate);
+
+/**
+ * omap_iommu_runtime_suspend - disable an iommu device
+ * @dev:        iommu device
+ *
+ * This function performs all that is necessary to disable an
+ * IOMMU device, either during final detachment from a client
+ * device, or during system/runtime suspend of the device. This
+ * includes programming all the appropriate IOMMU registers, and
+ * managing the associated omap_hwmod's state and the device's
+ * reset line. This function also saves the context of any
+ * locked TLBs if suspending.
+ **/
+static __maybe_unused int omap_iommu_runtime_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct iommu_platform_data *pdata = dev_get_platdata(dev);
+        struct omap_iommu *obj = to_iommu(dev);
+        int ret;
+
+        /* save the TLBs only during suspend, and not for power down */
+        if (obj->domain && obj->iopgd)
+                omap_iommu_save_tlb_entries(obj);
+
+        omap2_iommu_disable(obj);
+
+        if (pdata && pdata->device_idle)
+                pdata->device_idle(pdev);
+
+        if (pdata && pdata->assert_reset)
+                pdata->assert_reset(pdev, pdata->reset_name);
+
+        if (pdata && pdata->set_pwrdm_constraint) {
+                ret = pdata->set_pwrdm_constraint(pdev, false, &obj->pwrst);
+                if (ret) {
+                        dev_warn(obj->dev, "pwrdm_constraint failed to be reset, status = %d\n",
+                                 ret);
+                }
+        }
+
+        return 0;
+}
+
+/**
+ * omap_iommu_runtime_resume - enable an iommu device
+ * @dev:        iommu device
+ *
+ * This function performs all that is necessary to enable an
+ * IOMMU device, either during initial attachment to a client
+ * device, or during system/runtime resume of the device. This
+ * includes programming all the appropriate IOMMU registers, and
+ * managing the associated omap_hwmod's state and the device's
+ * reset line. The function also restores any locked TLBs if
+ * resuming after a suspend.
+ **/
+static __maybe_unused int omap_iommu_runtime_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct iommu_platform_data *pdata = dev_get_platdata(dev);
+        struct omap_iommu *obj = to_iommu(dev);
+        int ret = 0;
+
+        if (pdata && pdata->set_pwrdm_constraint) {
+                ret = pdata->set_pwrdm_constraint(pdev, true, &obj->pwrst);
+                if (ret) {
+                        dev_warn(obj->dev, "pwrdm_constraint failed to be set, status = %d\n",
+                                 ret);
+                }
+        }
+
+        if (pdata && pdata->deassert_reset) {
+                ret = pdata->deassert_reset(pdev, pdata->reset_name);
+                if (ret) {
+                        dev_err(dev, "deassert_reset failed: %d\n", ret);
+                        return ret;
+                }
+        }
+
+        if (pdata && pdata->device_enable)
+                pdata->device_enable(pdev);
+
+        /* restore the TLBs only during resume, and not for power up */
+        if (obj->domain)
+                omap_iommu_restore_tlb_entries(obj);
+
+        ret = omap2_iommu_enable(obj);
+
+        return ret;
+}
+
+/**
+ * omap_iommu_suspend_prepare - prepare() dev_pm_ops implementation
+ * @dev:        iommu device
+ *
+ * This function performs the necessary checks to determine if the IOMMU
+ * device needs suspending or not. The function checks if the runtime_pm
+ * status of the device is suspended, and returns 1 in that case. This
+ * results in the PM core to skip invoking any of the Sleep PM callbacks
+ * (suspend, suspend_late, resume, resume_early etc).
+ */
+static int omap_iommu_prepare(struct device *dev)
+{
+        if (pm_runtime_status_suspended(dev))
+                return 1;
+        return 0;
+}
+
 static bool omap_iommu_can_register(struct platform_device *pdev)
 {
         struct device_node *np = pdev->dev.of_node;
@@ -974,6 +1177,7 @@ static int omap_iommu_probe(struct platform_device *pdev)
         struct omap_iommu *obj;
         struct resource *res;
         struct device_node *of = pdev->dev.of_node;
+        struct orphan_dev *orphan_dev, *tmp;
 
         if (!of) {
                 pr_err("%s: only DT-based devices are supported\n", __func__);
@@ -984,6 +1188,15 @@ static int omap_iommu_probe(struct platform_device *pdev)
         if (!obj)
                 return -ENOMEM;
 
+        /*
+         * self-manage the ordering dependencies between omap_device_enable/idle
+         * and omap_device_assert/deassert_hardreset API
+         */
+        if (pdev->dev.pm_domain) {
+                dev_dbg(&pdev->dev, "device pm_domain is being reset\n");
+                pdev->dev.pm_domain = NULL;
+        }
+
         obj->name = dev_name(&pdev->dev);
         obj->nr_tlb_entries = 32;
         err = of_property_read_u32(of, "ti,#tlb-entries", &obj->nr_tlb_entries);
@@ -996,6 +1209,11 @@ static int omap_iommu_probe(struct platform_device *pdev)
 
         obj->dev = &pdev->dev;
         obj->ctx = (void *)obj + sizeof(*obj);
+        obj->cr_ctx = devm_kzalloc(&pdev->dev,
+                                   sizeof(*obj->cr_ctx) * obj->nr_tlb_entries,
+                                   GFP_KERNEL);
+        if (!obj->cr_ctx)
+                return -ENOMEM;
 
         spin_lock_init(&obj->iommu_lock);
         spin_lock_init(&obj->page_table_lock);
@@ -1036,13 +1254,20 @@ static int omap_iommu_probe(struct platform_device *pdev)
                         goto out_sysfs;
         }
 
-        pm_runtime_irq_safe(obj->dev);
         pm_runtime_enable(obj->dev);
 
         omap_iommu_debugfs_add(obj);
 
         dev_info(&pdev->dev, "%s registered\n", obj->name);
 
+        list_for_each_entry_safe(orphan_dev, tmp, &orphan_dev_list, node) {
+                err = _omap_iommu_add_device(orphan_dev->dev);
+                if (!err) {
+                        list_del(&orphan_dev->node);
+                        kfree(orphan_dev);
+                }
+        }
+
         return 0;
 
 out_sysfs:
@@ -1072,6 +1297,14 @@ static int omap_iommu_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct dev_pm_ops omap_iommu_pm_ops = {
+        .prepare = omap_iommu_prepare,
+        SET_LATE_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
+                                     pm_runtime_force_resume)
+        SET_RUNTIME_PM_OPS(omap_iommu_runtime_suspend,
+                           omap_iommu_runtime_resume, NULL)
+};
+
 static const struct of_device_id omap_iommu_of_match[] = {
         { .compatible = "ti,omap2-iommu" },
         { .compatible = "ti,omap4-iommu" },
@@ -1085,6 +1318,7 @@ static struct platform_driver omap_iommu_driver = {
         .remove = omap_iommu_remove,
         .driver = {
                 .name   = "omap-iommu",
+                .pm     = &omap_iommu_pm_ops,
                 .of_match_table = of_match_ptr(omap_iommu_of_match),
         },
 };
@@ -1423,7 +1657,7 @@ static phys_addr_t omap_iommu_iova_to_phys(struct iommu_domain *domain,
         return ret;
 }
 
-static int omap_iommu_add_device(struct device *dev)
+static int _omap_iommu_add_device(struct device *dev)
 {
         struct omap_iommu_arch_data *arch_data, *tmp;
         struct omap_iommu *oiommu;
@@ -1432,6 +1666,8 @@ static int omap_iommu_add_device(struct device *dev)
         struct platform_device *pdev;
         int num_iommus, i;
         int ret;
+        struct orphan_dev *orphan_dev;
+        unsigned long flags;
 
         /*
          * Allocate the archdata iommu structure for DT-based devices.
@@ -1463,10 +1699,26 @@ static int omap_iommu_add_device(struct device *dev)
                 }
 
                 pdev = of_find_device_by_node(np);
-                if (WARN_ON(!pdev)) {
+                if (!pdev) {
                         of_node_put(np);
                         kfree(arch_data);
-                        return -EINVAL;
+                        spin_lock_irqsave(&orphan_lock, flags);
+                        list_for_each_entry(orphan_dev, &orphan_dev_list,
+                                            node) {
+                                if (orphan_dev->dev == dev)
+                                        break;
+                        }
+                        spin_unlock_irqrestore(&orphan_lock, flags);
+
+                        if (orphan_dev && orphan_dev->dev == dev)
+                                return -EPROBE_DEFER;
+
+                        orphan_dev = kzalloc(sizeof(*orphan_dev), GFP_KERNEL);
+                        orphan_dev->dev = dev;
+                        spin_lock_irqsave(&orphan_lock, flags);
+                        list_add(&orphan_dev->node, &orphan_dev_list);
+                        spin_unlock_irqrestore(&orphan_lock, flags);
+                        return -EPROBE_DEFER;
                 }
 
                 oiommu = platform_get_drvdata(pdev);
@@ -1477,6 +1729,7 @@ static int omap_iommu_add_device(struct device *dev)
                 }
 
                 tmp->iommu_dev = oiommu;
+                tmp->dev = &pdev->dev;
 
                 of_node_put(np);
         }
@@ -1511,6 +1764,17 @@ static int omap_iommu_add_device(struct device *dev)
         return 0;
 }
 
+static int omap_iommu_add_device(struct device *dev)
+{
+        int ret;
+
+        ret = _omap_iommu_add_device(dev);
+        if (ret == -EPROBE_DEFER)
+                return 0;
+
+        return ret;
+}
+
 static void omap_iommu_remove_device(struct device *dev)
 {
         struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;
@@ -1554,7 +1818,7 @@ static const struct iommu_ops omap_iommu_ops = {
 static int __init omap_iommu_init(void)
 {
         struct kmem_cache *p;
-        const unsigned long flags = SLAB_HWCACHE_ALIGN;
+        const slab_flags_t flags = SLAB_HWCACHE_ALIGN;
         size_t align = 1 << 10; /* L2 pagetable alignement */
         struct device_node *np;
         int ret;
diff --git a/drivers/iommu/omap-iommu.h b/drivers/iommu/omap-iommu.h
index 09968a02d291..18ee713ede78 100644
--- a/drivers/iommu/omap-iommu.h
+++ b/drivers/iommu/omap-iommu.h
@@ -73,16 +73,22 @@ struct omap_iommu {
 
         void *ctx; /* iommu context: registres saved area */
 
+        struct cr_regs *cr_ctx;
+        u32 num_cr_ctx;
+
         int has_bus_err_back;
         u32 id;
 
         struct iommu_device iommu;
         struct iommu_group *group;
+
+        u8 pwrst;
 };
 
 /**
  * struct omap_iommu_arch_data - omap iommu private data
- * @iommu_dev: handle of the iommu device
+ * @iommu_dev: handle of the OMAP iommu device
+ * @dev: handle of the iommu device
  *
  * This is an omap iommu private data object, which binds an iommu user
  * to its iommu device. This object should be placed at the iommu user's
@@ -91,6 +97,7 @@ struct omap_iommu {
  */
 struct omap_iommu_arch_data {
         struct omap_iommu *iommu_dev;
+        struct device *dev;
 };
 
 struct cr_regs {
diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c
index fd33cf5981d7..c31e7bc4ccbe 100644
--- a/drivers/iommu/qcom_iommu.c
+++ b/drivers/iommu/qcom_iommu.c
@@ -725,10 +725,8 @@ static int qcom_iommu_ctx_probe(struct platform_device *pdev)
                 return PTR_ERR(ctx->base);
 
         irq = platform_get_irq(pdev, 0);
-        if (irq < 0) {
-                dev_err(dev, "failed to get irq\n");
+        if (irq < 0)
                 return -ENODEV;
-        }
 
         /* clear IRQs before registering fault handler, just in case the
          * boot-loader left us a surprise:
@@ -804,7 +802,7 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
         struct qcom_iommu_dev *qcom_iommu;
         struct device *dev = &pdev->dev;
         struct resource *res;
-        int ret, sz, max_asid = 0;
+        int ret, max_asid = 0;
 
         /* find the max asid (which is 1:1 to ctx bank idx), so we know how
          * many child ctx devices we have:
@@ -812,9 +810,8 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
         for_each_child_of_node(dev->of_node, child)
                 max_asid = max(max_asid, get_asid(child));
 
-        sz = sizeof(*qcom_iommu) + (max_asid * sizeof(qcom_iommu->ctxs[0]));
-
-        qcom_iommu = devm_kzalloc(dev, sz, GFP_KERNEL);
+        qcom_iommu = devm_kzalloc(dev, struct_size(qcom_iommu, ctxs, max_asid),
+                                  GFP_KERNEL);
         if (!qcom_iommu)
                 return -ENOMEM;
         qcom_iommu->num_ctxs = max_asid;
diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c
index b6b5acc92ca2..2a48ea3f1b30 100644
--- a/drivers/md/dm-bufio.c
+++ b/drivers/md/dm-bufio.c
@@ -1599,7 +1599,9 @@ dm_bufio_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
         unsigned long freed;
 
         c = container_of(shrink, struct dm_bufio_client, shrinker);
-        if (!dm_bufio_trylock(c))
+        if (sc->gfp_mask & __GFP_FS)
+                dm_bufio_lock(c);
+        else if (!dm_bufio_trylock(c))
                 return SHRINK_STOP;
 
         freed  = __scan(c, sc->nr_to_scan, sc->gfp_mask);
diff --git a/drivers/md/dm-dust.c b/drivers/md/dm-dust.c
index 845f376a72d9..8288887b7f94 100644
--- a/drivers/md/dm-dust.c
+++ b/drivers/md/dm-dust.c
@@ -25,6 +25,7 @@ struct dust_device {
         unsigned long long badblock_count;
         spinlock_t dust_lock;
         unsigned int blksz;
+        int sect_per_block_shift;
         unsigned int sect_per_block;
         sector_t start;
         bool fail_read_on_bb:1;
@@ -79,7 +80,7 @@ static int dust_remove_block(struct dust_device *dd, unsigned long long block)
         unsigned long flags;
 
         spin_lock_irqsave(&dd->dust_lock, flags);
-        bblock = dust_rb_search(&dd->badblocklist, block * dd->sect_per_block);
+        bblock = dust_rb_search(&dd->badblocklist, block);
 
         if (bblock == NULL) {
                 if (!dd->quiet_mode) {
@@ -113,7 +114,7 @@ static int dust_add_block(struct dust_device *dd, unsigned long long block)
         }
 
         spin_lock_irqsave(&dd->dust_lock, flags);
-        bblock->bb = block * dd->sect_per_block;
+        bblock->bb = block;
         if (!dust_rb_insert(&dd->badblocklist, bblock)) {
                 if (!dd->quiet_mode) {
                         DMERR("%s: block %llu already in badblocklist",
@@ -138,7 +139,7 @@ static int dust_query_block(struct dust_device *dd, unsigned long long block)
         unsigned long flags;
 
         spin_lock_irqsave(&dd->dust_lock, flags);
-        bblock = dust_rb_search(&dd->badblocklist, block * dd->sect_per_block);
+        bblock = dust_rb_search(&dd->badblocklist, block);
         if (bblock != NULL)
                 DMINFO("%s: block %llu found in badblocklist", __func__, block);
         else
@@ -165,6 +166,7 @@ static int dust_map_read(struct dust_device *dd, sector_t thisblock,
         int ret = DM_MAPIO_REMAPPED;
 
         if (fail_read_on_bb) {
+                thisblock >>= dd->sect_per_block_shift;
                 spin_lock_irqsave(&dd->dust_lock, flags);
                 ret = __dust_map_read(dd, thisblock);
                 spin_unlock_irqrestore(&dd->dust_lock, flags);
@@ -195,6 +197,7 @@ static int dust_map_write(struct dust_device *dd, sector_t thisblock,
         unsigned long flags;
 
         if (fail_read_on_bb) {
+                thisblock >>= dd->sect_per_block_shift;
                 spin_lock_irqsave(&dd->dust_lock, flags);
                 __dust_map_write(dd, thisblock);
                 spin_unlock_irqrestore(&dd->dust_lock, flags);
@@ -331,6 +334,8 @@ static int dust_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         dd->blksz = blksz;
         dd->start = tmp;
 
+        dd->sect_per_block_shift = __ffs(sect_per_block);
+
         /*
          * Whether to fail a read on a "bad" block.
          * Defaults to false; enabled later by message.
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index b1b0de402dfc..9118ab85cb3a 100644
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -1943,7 +1943,22 @@ offload_to_thread:
                         queue_work(ic->wait_wq, &dio->work);
                         return;
                 }
+                if (journal_read_pos != NOT_FOUND)
+                        dio->range.n_sectors = ic->sectors_per_block;
                 wait_and_add_new_range(ic, &dio->range);
+                /*
+                 * wait_and_add_new_range drops the spinlock, so the journal
+                 * may have been changed arbitrarily. We need to recheck.
+                 * To simplify the code, we restrict I/O size to just one block.
+                 */
+                if (journal_read_pos != NOT_FOUND) {
+                        sector_t next_sector;
+                        unsigned new_pos = find_journal_node(ic, dio->range.logical_sector, &next_sector);
+                        if (unlikely(new_pos != journal_read_pos)) {
+                                remove_range_unlocked(ic, &dio->range);
+                                goto retry;
+                        }
+                }
         }
         spin_unlock_irq(&ic->endio_wait.lock);
 
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c
index df2011de7be2..1bbe4a34ef4c 100644
--- a/drivers/md/dm-kcopyd.c
+++ b/drivers/md/dm-kcopyd.c
@@ -566,8 +566,10 @@ static int run_io_job(struct kcopyd_job *job)
          * no point in continuing.
          */
         if (test_bit(DM_KCOPYD_WRITE_SEQ, &job->flags) &&
-            job->master_job->write_err)
+            job->master_job->write_err) {
+                job->write_err = job->master_job->write_err;
                 return -EIO;
+        }
 
         io_job_start(job->kc->throttle);
 
@@ -619,6 +621,7 @@ static int process_jobs(struct list_head *jobs, struct dm_kcopyd_client *kc,
                         else
                                 job->read_err = 1;
                         push(&kc->complete_jobs, job);
+                        wake(kc);
                         break;
                 }
 
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 8a60a4a070ac..1f933dd197cd 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -3194,7 +3194,7 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                           */
                         r = rs_prepare_reshape(rs);
                         if (r)
-                                return r;
+                                goto bad;
 
                         /* Reshaping ain't recovery, so disable recovery */
                         rs_setup_recovery(rs, MaxSector);
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 7b6c3ee9e755..8820931ec7d2 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -1342,7 +1342,7 @@ void dm_table_event(struct dm_table *t)
 }
 EXPORT_SYMBOL(dm_table_event);
 
-sector_t dm_table_get_size(struct dm_table *t)
+inline sector_t dm_table_get_size(struct dm_table *t)
 {
         return t->num_targets ? (t->highs[t->num_targets - 1] + 1) : 0;
 }
@@ -1367,6 +1367,9 @@ struct dm_target *dm_table_find_target(struct dm_table *t, sector_t sector)
         unsigned int l, n = 0, k = 0;
         sector_t *node;
 
+        if (unlikely(sector >= dm_table_get_size(t)))
+                return &t->targets[t->num_targets];
+
         for (l = 0; l < t->depth; l++) {
                 n = get_child(n, k);
                 node = get_node(t, l, n);
diff --git a/drivers/md/dm-zoned-metadata.c b/drivers/md/dm-zoned-metadata.c
index 8545dcee9fd0..595a73110e17 100644
--- a/drivers/md/dm-zoned-metadata.c
+++ b/drivers/md/dm-zoned-metadata.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2017 Western Digital Corporation or its affiliates.
  *
@@ -34,7 +35,7 @@
  *    (1) Super block (1 block)
  *    (2) Chunk mapping table (nr_map_blocks)
  *    (3) Bitmap blocks (nr_bitmap_blocks)
- * All metadata blocks are stored in conventional zones, starting from the
+ * All metadata blocks are stored in conventional zones, starting from
  * the first conventional zone found on disk.
  */
 struct dmz_super {
@@ -233,7 +234,7 @@ void dmz_unlock_map(struct dmz_metadata *zmd)
  * Lock/unlock metadata access. This is a "read" lock on a semaphore
  * that prevents metadata flush from running while metadata are being
  * modified. The actual metadata write mutual exclusion is achieved with
- * the map lock and zone styate management (active and reclaim state are
+ * the map lock and zone state management (active and reclaim state are
  * mutually exclusive).
  */
 void dmz_lock_metadata(struct dmz_metadata *zmd)
@@ -402,15 +403,18 @@ static struct dmz_mblock *dmz_get_mblock_slow(struct dmz_metadata *zmd,
         sector_t block = zmd->sb[zmd->mblk_primary].block + mblk_no;
         struct bio *bio;
 
+        if (dmz_bdev_is_dying(zmd->dev))
+                return ERR_PTR(-EIO);
+
         /* Get a new block and a BIO to read it */
         mblk = dmz_alloc_mblock(zmd, mblk_no);
         if (!mblk)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         bio = bio_alloc(GFP_NOIO, 1);
         if (!bio) {
                 dmz_free_mblock(zmd, mblk);
-                return NULL;
+                return ERR_PTR(-ENOMEM);
         }
 
         spin_lock(&zmd->mblk_lock);
@@ -541,8 +545,8 @@ static struct dmz_mblock *dmz_get_mblock(struct dmz_metadata *zmd,
         if (!mblk) {
                 /* Cache miss: read the block from disk */
                 mblk = dmz_get_mblock_slow(zmd, mblk_no);
-                if (!mblk)
-                        return ERR_PTR(-ENOMEM);
+                if (IS_ERR(mblk))
+                        return mblk;
         }
 
         /* Wait for on-going read I/O and check for error */
@@ -570,16 +574,19 @@ static void dmz_dirty_mblock(struct dmz_metadata *zmd, struct dmz_mblock *mblk)
 /*
  * Issue a metadata block write BIO.
  */
-static void dmz_write_mblock(struct dmz_metadata *zmd, struct dmz_mblock *mblk,
-                             unsigned int set)
+static int dmz_write_mblock(struct dmz_metadata *zmd, struct dmz_mblock *mblk,
+                            unsigned int set)
 {
         sector_t block = zmd->sb[set].block + mblk->no;
         struct bio *bio;
 
+        if (dmz_bdev_is_dying(zmd->dev))
+                return -EIO;
+
         bio = bio_alloc(GFP_NOIO, 1);
         if (!bio) {
                 set_bit(DMZ_META_ERROR, &mblk->state);
-                return;
+                return -ENOMEM;
         }
 
         set_bit(DMZ_META_WRITING, &mblk->state);
@@ -591,6 +598,8 @@ static void dmz_write_mblock(struct dmz_metadata *zmd, struct dmz_mblock *mblk,
         bio_set_op_attrs(bio, REQ_OP_WRITE, REQ_META | REQ_PRIO);
         bio_add_page(bio, mblk->page, DMZ_BLOCK_SIZE, 0);
         submit_bio(bio);
+
+        return 0;
 }
 
 /*
@@ -602,6 +611,9 @@ static int dmz_rdwr_block(struct dmz_metadata *zmd, int op, sector_t block,
         struct bio *bio;
         int ret;
 
+        if (dmz_bdev_is_dying(zmd->dev))
+                return -EIO;
+
         bio = bio_alloc(GFP_NOIO, 1);
         if (!bio)
                 return -ENOMEM;
@@ -659,22 +671,29 @@ static int dmz_write_dirty_mblocks(struct dmz_metadata *zmd,
 {
         struct dmz_mblock *mblk;
         struct blk_plug plug;
-        int ret = 0;
+        int ret = 0, nr_mblks_submitted = 0;
 
         /* Issue writes */
         blk_start_plug(&plug);
-        list_for_each_entry(mblk, write_list, link)
-                dmz_write_mblock(zmd, mblk, set);
+        list_for_each_entry(mblk, write_list, link) {
+                ret = dmz_write_mblock(zmd, mblk, set);
+                if (ret)
+                        break;
+                nr_mblks_submitted++;
+        }
         blk_finish_plug(&plug);
 
         /* Wait for completion */
         list_for_each_entry(mblk, write_list, link) {
+                if (!nr_mblks_submitted)
+                        break;
                 wait_on_bit_io(&mblk->state, DMZ_META_WRITING,
                                TASK_UNINTERRUPTIBLE);
                 if (test_bit(DMZ_META_ERROR, &mblk->state)) {
                         clear_bit(DMZ_META_ERROR, &mblk->state);
                         ret = -EIO;
                 }
+                nr_mblks_submitted--;
         }
 
         /* Flush drive cache (this will also sync data) */
@@ -736,6 +755,11 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)
          */
         dmz_lock_flush(zmd);
 
+        if (dmz_bdev_is_dying(zmd->dev)) {
+                ret = -EIO;
+                goto out;
+        }
+
         /* Get dirty blocks */
         spin_lock(&zmd->mblk_lock);
         list_splice_init(&zmd->mblk_dirty_list, &write_list);
@@ -1542,7 +1566,7 @@ static struct dm_zone *dmz_get_rnd_zone_for_reclaim(struct dmz_metadata *zmd)
         struct dm_zone *zone;
 
         if (list_empty(&zmd->map_rnd_list))
-                return NULL;
+                return ERR_PTR(-EBUSY);
 
         list_for_each_entry(zone, &zmd->map_rnd_list, link) {
                 if (dmz_is_buf(zone))
@@ -1553,7 +1577,7 @@ static struct dm_zone *dmz_get_rnd_zone_for_reclaim(struct dmz_metadata *zmd)
                         return dzone;
         }
 
-        return NULL;
+        return ERR_PTR(-EBUSY);
 }
 
 /*
@@ -1564,7 +1588,7 @@ static struct dm_zone *dmz_get_seq_zone_for_reclaim(struct dmz_metadata *zmd)
         struct dm_zone *zone;
 
         if (list_empty(&zmd->map_seq_list))
-                return NULL;
+                return ERR_PTR(-EBUSY);
 
         list_for_each_entry(zone, &zmd->map_seq_list, link) {
                 if (!zone->bzone)
@@ -1573,7 +1597,7 @@ static struct dm_zone *dmz_get_seq_zone_for_reclaim(struct dmz_metadata *zmd)
                         return zone;
         }
 
-        return NULL;
+        return ERR_PTR(-EBUSY);
 }
 
 /*
@@ -1628,9 +1652,13 @@ again:
                 if (op != REQ_OP_WRITE)
                         goto out;
 
-                /* Alloate a random zone */
+                /* Allocate a random zone */
                 dzone = dmz_alloc_zone(zmd, DMZ_ALLOC_RND);
                 if (!dzone) {
+                        if (dmz_bdev_is_dying(zmd->dev)) {
+                                dzone = ERR_PTR(-EIO);
+                                goto out;
+                        }
                         dmz_wait_for_free_zones(zmd);
                         goto again;
                 }
@@ -1725,9 +1753,13 @@ again:
         if (bzone)
                 goto out;
 
-        /* Alloate a random zone */
+        /* Allocate a random zone */
         bzone = dmz_alloc_zone(zmd, DMZ_ALLOC_RND);
         if (!bzone) {
+                if (dmz_bdev_is_dying(zmd->dev)) {
+                        bzone = ERR_PTR(-EIO);
+                        goto out;
+                }
                 dmz_wait_for_free_zones(zmd);
                 goto again;
         }
diff --git a/drivers/md/dm-zoned-reclaim.c b/drivers/md/dm-zoned-reclaim.c
index edf4b95eb075..d240d7ca8a8a 100644
--- a/drivers/md/dm-zoned-reclaim.c
+++ b/drivers/md/dm-zoned-reclaim.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2017 Western Digital Corporation or its affiliates.
  *
@@ -37,7 +38,7 @@ enum {
 /*
  * Number of seconds of target BIO inactivity to consider the target idle.
  */
-#define DMZ_IDLE_PERIOD         (10UL * HZ)
+#define DMZ_IDLE_PERIOD                 (10UL * HZ)
 
 /*
  * Percentage of unmapped (free) random zones below which reclaim starts
@@ -134,6 +135,9 @@ static int dmz_reclaim_copy(struct dmz_reclaim *zrc,
                 set_bit(DM_KCOPYD_WRITE_SEQ, &flags);
 
         while (block < end_block) {
+                if (dev->flags & DMZ_BDEV_DYING)
+                        return -EIO;
+
                 /* Get a valid region from the source zone */
                 ret = dmz_first_valid_block(zmd, src_zone, &block);
                 if (ret <= 0)
@@ -215,7 +219,7 @@ static int dmz_reclaim_buf(struct dmz_reclaim *zrc, struct dm_zone *dzone)
 
         dmz_unlock_flush(zmd);
 
-        return 0;
+        return ret;
 }
 
 /*
@@ -259,7 +263,7 @@ static int dmz_reclaim_seq_data(struct dmz_reclaim *zrc, struct dm_zone *dzone)
 
         dmz_unlock_flush(zmd);
 
-        return 0;
+        return ret;
 }
 
 /*
@@ -312,7 +316,7 @@ static int dmz_reclaim_rnd_data(struct dmz_reclaim *zrc, struct dm_zone *dzone)
 
         dmz_unlock_flush(zmd);
 
-        return 0;
+        return ret;
 }
 
 /*
@@ -334,7 +338,7 @@ static void dmz_reclaim_empty(struct dmz_reclaim *zrc, struct dm_zone *dzone)
 /*
  * Find a candidate zone for reclaim and process it.
  */
-static void dmz_reclaim(struct dmz_reclaim *zrc)
+static int dmz_do_reclaim(struct dmz_reclaim *zrc)
 {
         struct dmz_metadata *zmd = zrc->metadata;
         struct dm_zone *dzone;
@@ -344,8 +348,8 @@ static void dmz_reclaim(struct dmz_reclaim *zrc)
 
         /* Get a data zone */
         dzone = dmz_get_zone_for_reclaim(zmd);
-        if (!dzone)
-                return;
+        if (IS_ERR(dzone))
+                return PTR_ERR(dzone);
 
         start = jiffies;
 
@@ -391,13 +395,20 @@ static void dmz_reclaim(struct dmz_reclaim *zrc)
 out:
         if (ret) {
                 dmz_unlock_zone_reclaim(dzone);
-                return;
+                return ret;
         }
 
-        (void) dmz_flush_metadata(zrc->metadata);
+        ret = dmz_flush_metadata(zrc->metadata);
+        if (ret) {
+                dmz_dev_debug(zrc->dev,
+                              "Metadata flush for zone %u failed, err %d\n",
+                              dmz_id(zmd, rzone), ret);
+                return ret;
+        }
 
         dmz_dev_debug(zrc->dev, "Reclaimed zone %u in %u ms",
                       dmz_id(zmd, rzone), jiffies_to_msecs(jiffies - start));
+        return 0;
 }
 
 /*
@@ -427,7 +438,7 @@ static bool dmz_should_reclaim(struct dmz_reclaim *zrc)
                 return false;
 
         /*
-         * If the percentage of unmappped random zones is low,
+         * If the percentage of unmapped random zones is low,
          * reclaim even if the target is busy.
          */
         return p_unmap_rnd <= DMZ_RECLAIM_LOW_UNMAP_RND;
@@ -442,6 +453,10 @@ static void dmz_reclaim_work(struct work_struct *work)
         struct dmz_metadata *zmd = zrc->metadata;
         unsigned int nr_rnd, nr_unmap_rnd;
         unsigned int p_unmap_rnd;
+        int ret;
+
+        if (dmz_bdev_is_dying(zrc->dev))
+                return;
 
         if (!dmz_should_reclaim(zrc)) {
                 mod_delayed_work(zrc->wq, &zrc->work, DMZ_IDLE_PERIOD);
@@ -471,7 +486,17 @@ static void dmz_reclaim_work(struct work_struct *work)
                       (dmz_target_idle(zrc) ? "Idle" : "Busy"),
                       p_unmap_rnd, nr_unmap_rnd, nr_rnd);
 
-        dmz_reclaim(zrc);
+        ret = dmz_do_reclaim(zrc);
+        if (ret) {
+                dmz_dev_debug(zrc->dev, "Reclaim error %d\n", ret);
+                if (ret == -EIO)
+                        /*
+                         * LLD might be performing some error handling sequence
+                         * at the underlying device. To not interfere, do not
+                         * attempt to schedule the next reclaim run immediately.
+                         */
+                        return;
+        }
 
         dmz_schedule_reclaim(zrc);
 }
diff --git a/drivers/md/dm-zoned-target.c b/drivers/md/dm-zoned-target.c
index 51d029bbb740..31478fef6032 100644
--- a/drivers/md/dm-zoned-target.c
+++ b/drivers/md/dm-zoned-target.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2017 Western Digital Corporation or its affiliates.
  *
@@ -133,6 +134,8 @@ static int dmz_submit_bio(struct dmz_target *dmz, struct dm_zone *zone,
 
         refcount_inc(&bioctx->ref);
         generic_make_request(clone);
+        if (clone->bi_status == BLK_STS_IOERR)
+                return -EIO;
 
         if (bio_op(bio) == REQ_OP_WRITE && dmz_is_seq(zone))
                 zone->wp_block += nr_blocks;
@@ -277,8 +280,8 @@ static int dmz_handle_buffered_write(struct dmz_target *dmz,
 
         /* Get the buffer zone. One will be allocated if needed */
         bzone = dmz_get_chunk_buffer(zmd, zone);
-        if (!bzone)
-                return -ENOSPC;
+        if (IS_ERR(bzone))
+                return PTR_ERR(bzone);
 
         if (dmz_is_readonly(bzone))
                 return -EROFS;
@@ -389,6 +392,11 @@ static void dmz_handle_bio(struct dmz_target *dmz, struct dm_chunk_work *cw,
 
         dmz_lock_metadata(zmd);
 
+        if (dmz->dev->flags & DMZ_BDEV_DYING) {
+                ret = -EIO;
+                goto out;
+        }
+
         /*
          * Get the data zone mapping the chunk. There may be no
          * mapping for read and discard. If a mapping is obtained,
@@ -493,6 +501,8 @@ static void dmz_flush_work(struct work_struct *work)
 
         /* Flush dirty metadata blocks */
         ret = dmz_flush_metadata(dmz->metadata);
+        if (ret)
+                dmz_dev_debug(dmz->dev, "Metadata flush failed, rc=%d\n", ret);
 
         /* Process queued flush requests */
         while (1) {
@@ -513,22 +523,24 @@ static void dmz_flush_work(struct work_struct *work)
  * Get a chunk work and start it to process a new BIO.
  * If the BIO chunk has no work yet, create one.
  */
-static void dmz_queue_chunk_work(struct dmz_target *dmz, struct bio *bio)
+static int dmz_queue_chunk_work(struct dmz_target *dmz, struct bio *bio)
 {
         unsigned int chunk = dmz_bio_chunk(dmz->dev, bio);
         struct dm_chunk_work *cw;
+        int ret = 0;
 
         mutex_lock(&dmz->chunk_lock);
 
         /* Get the BIO chunk work. If one is not active yet, create one */
         cw = radix_tree_lookup(&dmz->chunk_rxtree, chunk);
         if (!cw) {
-                int ret;
 
                 /* Create a new chunk work */
                 cw = kmalloc(sizeof(struct dm_chunk_work), GFP_NOIO);
-                if (!cw)
+                if (unlikely(!cw)) {
+                        ret = -ENOMEM;
                         goto out;
+                }
 
                 INIT_WORK(&cw->work, dmz_chunk_work);
                 refcount_set(&cw->refcount, 0);
@@ -539,7 +551,6 @@ static void dmz_queue_chunk_work(struct dmz_target *dmz, struct bio *bio)
                 ret = radix_tree_insert(&dmz->chunk_rxtree, chunk, cw);
                 if (unlikely(ret)) {
                         kfree(cw);
-                        cw = NULL;
                         goto out;
                 }
         }
@@ -547,10 +558,38 @@ static void dmz_queue_chunk_work(struct dmz_target *dmz, struct bio *bio)
         bio_list_add(&cw->bio_list, bio);
         dmz_get_chunk_work(cw);
 
+        dmz_reclaim_bio_acc(dmz->reclaim);
         if (queue_work(dmz->chunk_wq, &cw->work))
                 dmz_get_chunk_work(cw);
 out:
         mutex_unlock(&dmz->chunk_lock);
+        return ret;
+}
+
+/*
+ * Check the backing device availability. If it's on the way out,
+ * start failing I/O. Reclaim and metadata components also call this
+ * function to cleanly abort operation in the event of such failure.
+ */
+bool dmz_bdev_is_dying(struct dmz_dev *dmz_dev)
+{
+        struct gendisk *disk;
+
+        if (!(dmz_dev->flags & DMZ_BDEV_DYING)) {
+                disk = dmz_dev->bdev->bd_disk;
+                if (blk_queue_dying(bdev_get_queue(dmz_dev->bdev))) {
+                        dmz_dev_warn(dmz_dev, "Backing device queue dying");
+                        dmz_dev->flags |= DMZ_BDEV_DYING;
+                } else if (disk->fops->check_events) {
+                        if (disk->fops->check_events(disk, 0) &
+                                        DISK_EVENT_MEDIA_CHANGE) {
+                                dmz_dev_warn(dmz_dev, "Backing device offline");
+                                dmz_dev->flags |= DMZ_BDEV_DYING;
+                        }
+                }
+        }
+
+        return dmz_dev->flags & DMZ_BDEV_DYING;
 }
 
 /*
@@ -564,6 +603,10 @@ static int dmz_map(struct dm_target *ti, struct bio *bio)
         sector_t sector = bio->bi_iter.bi_sector;
         unsigned int nr_sectors = bio_sectors(bio);
         sector_t chunk_sector;
+        int ret;
+
+        if (dmz_bdev_is_dying(dmz->dev))
+                return DM_MAPIO_KILL;
 
         dmz_dev_debug(dev, "BIO op %d sector %llu + %u => chunk %llu, block %llu, %u blocks",
                       bio_op(bio), (unsigned long long)sector, nr_sectors,
@@ -601,8 +644,14 @@ static int dmz_map(struct dm_target *ti, struct bio *bio)
                 dm_accept_partial_bio(bio, dev->zone_nr_sectors - chunk_sector);
 
         /* Now ready to handle this BIO */
-        dmz_reclaim_bio_acc(dmz->reclaim);
-        dmz_queue_chunk_work(dmz, bio);
+        ret = dmz_queue_chunk_work(dmz, bio);
+        if (ret) {
+                dmz_dev_debug(dmz->dev,
+                              "BIO op %d, can't process chunk %llu, err %i\n",
+                              bio_op(bio), (u64)dmz_bio_chunk(dmz->dev, bio),
+                              ret);
+                return DM_MAPIO_REQUEUE;
+        }
 
         return DM_MAPIO_SUBMITTED;
 }
@@ -855,6 +904,9 @@ static int dmz_prepare_ioctl(struct dm_target *ti, struct block_device **bdev)
 {
         struct dmz_target *dmz = ti->private;
 
+        if (dmz_bdev_is_dying(dmz->dev))
+                return -ENODEV;
+
         *bdev = dmz->dev->bdev;
 
         return 0;
diff --git a/drivers/md/dm-zoned.h b/drivers/md/dm-zoned.h
index ed8de49c9a08..d8e70b0ade35 100644
--- a/drivers/md/dm-zoned.h
+++ b/drivers/md/dm-zoned.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2017 Western Digital Corporation or its affiliates.
  *
@@ -56,6 +57,8 @@ struct dmz_dev {
 
         unsigned int            nr_zones;
 
+        unsigned int            flags;
+
         sector_t                zone_nr_sectors;
         unsigned int            zone_nr_sectors_shift;
 
@@ -67,6 +70,9 @@ struct dmz_dev {
                                  (dev)->zone_nr_sectors_shift)
 #define dmz_chunk_block(dev, b) ((b) & ((dev)->zone_nr_blocks - 1))
 
+/* Device flags. */
+#define DMZ_BDEV_DYING          (1 << 0)
+
 /*
  * Zone descriptor.
  */
@@ -245,4 +251,9 @@ void dmz_resume_reclaim(struct dmz_reclaim *zrc);
 void dmz_reclaim_bio_acc(struct dmz_reclaim *zrc);
 void dmz_schedule_reclaim(struct dmz_reclaim *zrc);
 
+/*
+ * Functions defined in dm-zoned-target.c
+ */
+bool dmz_bdev_is_dying(struct dmz_dev *dmz_dev);
+
 #endif /* DM_ZONED_H */
diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
index 58b319757b1e..8aae0624a297 100644
--- a/drivers/md/persistent-data/dm-btree.c
+++ b/drivers/md/persistent-data/dm-btree.c
@@ -628,39 +628,40 @@ static int btree_split_beneath(struct shadow_spine *s, uint64_t key)
 
         new_parent = shadow_current(s);
 
+        pn = dm_block_data(new_parent);
+        size = le32_to_cpu(pn->header.flags) & INTERNAL_NODE ?
+                sizeof(__le64) : s->info->value_type.size;
+
+        /* create & init the left block */
         r = new_block(s->info, &left);
         if (r < 0)
                 return r;
 
+        ln = dm_block_data(left);
+        nr_left = le32_to_cpu(pn->header.nr_entries) / 2;
+
+        ln->header.flags = pn->header.flags;
+        ln->header.nr_entries = cpu_to_le32(nr_left);
+        ln->header.max_entries = pn->header.max_entries;
+        ln->header.value_size = pn->header.value_size;
+        memcpy(ln->keys, pn->keys, nr_left * sizeof(pn->keys[0]));
+        memcpy(value_ptr(ln, 0), value_ptr(pn, 0), nr_left * size);
+
+        /* create & init the right block */
         r = new_block(s->info, &right);
         if (r < 0) {
                 unlock_block(s->info, left);
                 return r;
         }
 
-        pn = dm_block_data(new_parent);
-        ln = dm_block_data(left);
         rn = dm_block_data(right);
-
-        nr_left = le32_to_cpu(pn->header.nr_entries) / 2;
         nr_right = le32_to_cpu(pn->header.nr_entries) - nr_left;
 
-        ln->header.flags = pn->header.flags;
-        ln->header.nr_entries = cpu_to_le32(nr_left);
-        ln->header.max_entries = pn->header.max_entries;
-        ln->header.value_size = pn->header.value_size;
-
         rn->header.flags = pn->header.flags;
         rn->header.nr_entries = cpu_to_le32(nr_right);
         rn->header.max_entries = pn->header.max_entries;
         rn->header.value_size = pn->header.value_size;
-
-        memcpy(ln->keys, pn->keys, nr_left * sizeof(pn->keys[0]));
         memcpy(rn->keys, pn->keys + nr_left, nr_right * sizeof(pn->keys[0]));
-
-        size = le32_to_cpu(pn->header.flags) & INTERNAL_NODE ?
-                sizeof(__le64) : s->info->value_type.size;
-        memcpy(value_ptr(ln, 0), value_ptr(pn, 0), nr_left * size);
         memcpy(value_ptr(rn, 0), value_ptr(pn, nr_left),
                nr_right * size);
 
diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
index aec449243966..25328582cc48 100644
--- a/drivers/md/persistent-data/dm-space-map-metadata.c
+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
@@ -249,7 +249,7 @@ static int out(struct sm_metadata *smm)
         }
 
         if (smm->recursion_count == 1)
-                apply_bops(smm);
+                r = apply_bops(smm);
 
         smm->recursion_count--;
 
diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
index 42ab43affbff..439d7d886873 100644
--- a/drivers/memory/mtk-smi.c
+++ b/drivers/memory/mtk-smi.c
@@ -41,17 +41,40 @@
 #define SMI_LARB_NONSEC_CON(id) (0x380 + ((id) * 4))
 #define F_MMU_EN                BIT(0)
 
+/* SMI COMMON */
+#define SMI_BUS_SEL                     0x220
+#define SMI_BUS_LARB_SHIFT(larbid)      ((larbid) << 1)
+/* All are MMU0 defaultly. Only specialize mmu1 here. */
+#define F_MMU1_LARB(larbid)             (0x1 << SMI_BUS_LARB_SHIFT(larbid))
+
+enum mtk_smi_gen {
+        MTK_SMI_GEN1,
+        MTK_SMI_GEN2
+};
+
+struct mtk_smi_common_plat {
+        enum mtk_smi_gen gen;
+        bool             has_gals;
+        u32              bus_sel; /* Balance some larbs to enter mmu0 or mmu1 */
+};
+
 struct mtk_smi_larb_gen {
-        bool need_larbid;
         int port_in_larb[MTK_LARB_NR_MAX + 1];
         void (*config_port)(struct device *);
+        unsigned int                    larb_direct_to_common_mask;
+        bool                            has_gals;
 };
 
 struct mtk_smi {
         struct device                   *dev;
         struct clk                      *clk_apb, *clk_smi;
+        struct clk                      *clk_gals0, *clk_gals1;
         struct clk                      *clk_async; /*only needed by mt2701*/
-        void __iomem                    *smi_ao_base;
+        union {
+                void __iomem            *smi_ao_base; /* only for gen1 */
+                void __iomem            *base;        /* only for gen2 */
+        };
+        const struct mtk_smi_common_plat *plat;
 };
 
 struct mtk_smi_larb { /* larb: local arbiter */
@@ -63,82 +86,56 @@ struct mtk_smi_larb { /* larb: local arbiter */
         u32                             *mmu;
 };
 
-enum mtk_smi_gen {
-        MTK_SMI_GEN1,
-        MTK_SMI_GEN2
-};
-
-static int mtk_smi_enable(const struct mtk_smi *smi)
+static int mtk_smi_clk_enable(const struct mtk_smi *smi)
 {
         int ret;
 
-        ret = pm_runtime_get_sync(smi->dev);
-        if (ret < 0)
-                return ret;
-
         ret = clk_prepare_enable(smi->clk_apb);
         if (ret)
-                goto err_put_pm;
+                return ret;
 
         ret = clk_prepare_enable(smi->clk_smi);
         if (ret)
                 goto err_disable_apb;
 
+        ret = clk_prepare_enable(smi->clk_gals0);
+        if (ret)
+                goto err_disable_smi;
+
+        ret = clk_prepare_enable(smi->clk_gals1);
+        if (ret)
+                goto err_disable_gals0;
+
         return 0;
 
+err_disable_gals0:
+        clk_disable_unprepare(smi->clk_gals0);
+err_disable_smi:
+        clk_disable_unprepare(smi->clk_smi);
 err_disable_apb:
         clk_disable_unprepare(smi->clk_apb);
-err_put_pm:
-        pm_runtime_put_sync(smi->dev);
         return ret;
 }
 
-static void mtk_smi_disable(const struct mtk_smi *smi)
+static void mtk_smi_clk_disable(const struct mtk_smi *smi)
 {
+        clk_disable_unprepare(smi->clk_gals1);
+        clk_disable_unprepare(smi->clk_gals0);
         clk_disable_unprepare(smi->clk_smi);
         clk_disable_unprepare(smi->clk_apb);
-        pm_runtime_put_sync(smi->dev);
 }
 
 int mtk_smi_larb_get(struct device *larbdev)
 {
-        struct mtk_smi_larb *larb = dev_get_drvdata(larbdev);
-        const struct mtk_smi_larb_gen *larb_gen = larb->larb_gen;
-        struct mtk_smi *common = dev_get_drvdata(larb->smi_common_dev);
-        int ret;
-
-        /* Enable the smi-common's power and clocks */
-        ret = mtk_smi_enable(common);
-        if (ret)
-                return ret;
+        int ret = pm_runtime_get_sync(larbdev);
 
-        /* Enable the larb's power and clocks */
-        ret = mtk_smi_enable(&larb->smi);
-        if (ret) {
-                mtk_smi_disable(common);
-                return ret;
-        }
-
-        /* Configure the iommu info for this larb */
-        larb_gen->config_port(larbdev);
-
-        return 0;
+        return (ret < 0) ? ret : 0;
 }
 EXPORT_SYMBOL_GPL(mtk_smi_larb_get);
 
 void mtk_smi_larb_put(struct device *larbdev)
 {
-        struct mtk_smi_larb *larb = dev_get_drvdata(larbdev);
-        struct mtk_smi *common = dev_get_drvdata(larb->smi_common_dev);
-
-        /*
-         * Don't de-configure the iommu info for this larb since there may be
-         * several modules in this larb.
-         * The iommu info will be reset after power off.
-         */
-
-        mtk_smi_disable(&larb->smi);
-        mtk_smi_disable(common);
+        pm_runtime_put_sync(larbdev);
 }
 EXPORT_SYMBOL_GPL(mtk_smi_larb_put);
 
@@ -146,39 +143,26 @@ static int
 mtk_smi_larb_bind(struct device *dev, struct device *master, void *data)
 {
         struct mtk_smi_larb *larb = dev_get_drvdata(dev);
-        struct mtk_smi_iommu *smi_iommu = data;
+        struct mtk_smi_larb_iommu *larb_mmu = data;
         unsigned int         i;
 
-        if (larb->larb_gen->need_larbid) {
-                larb->mmu = &smi_iommu->larb_imu[larb->larbid].mmu;
-                return 0;
-        }
-
-        /*
-         * If there is no larbid property, Loop to find the corresponding
-         * iommu information.
-         */
-        for (i = 0; i < smi_iommu->larb_nr; i++) {
-                if (dev == smi_iommu->larb_imu[i].dev) {
-                        /* The 'mmu' may be updated in iommu-attach/detach. */
-                        larb->mmu = &smi_iommu->larb_imu[i].mmu;
+        for (i = 0; i < MTK_LARB_NR_MAX; i++) {
+                if (dev == larb_mmu[i].dev) {
+                        larb->larbid = i;
+                        larb->mmu = &larb_mmu[i].mmu;
                         return 0;
                 }
         }
         return -ENODEV;
 }
 
-static void mtk_smi_larb_config_port_mt2712(struct device *dev)
+static void mtk_smi_larb_config_port_gen2_general(struct device *dev)
 {
         struct mtk_smi_larb *larb = dev_get_drvdata(dev);
         u32 reg;
         int i;
 
-        /*
-         * larb 8/9 is the bdpsys larb, the iommu_en is enabled defaultly.
-         * Don't need to set it again.
-         */
-        if (larb->larbid == 8 || larb->larbid == 9)
+        if (BIT(larb->larbid) & larb->larb_gen->larb_direct_to_common_mask)
                 return;
 
         for_each_set_bit(i, (unsigned long *)larb->mmu, 32) {
@@ -243,7 +227,6 @@ static const struct mtk_smi_larb_gen mtk_smi_larb_mt8173 = {
 };
 
 static const struct mtk_smi_larb_gen mtk_smi_larb_mt2701 = {
-        .need_larbid = true,
         .port_in_larb = {
                 LARB0_PORT_OFFSET, LARB1_PORT_OFFSET,
                 LARB2_PORT_OFFSET, LARB3_PORT_OFFSET
@@ -252,8 +235,15 @@ static const struct mtk_smi_larb_gen mtk_smi_larb_mt2701 = {
 };
 
 static const struct mtk_smi_larb_gen mtk_smi_larb_mt2712 = {
-        .need_larbid = true,
-        .config_port = mtk_smi_larb_config_port_mt2712,
+        .config_port                = mtk_smi_larb_config_port_gen2_general,
+        .larb_direct_to_common_mask = BIT(8) | BIT(9),      /* bdpsys */
+};
+
+static const struct mtk_smi_larb_gen mtk_smi_larb_mt8183 = {
+        .has_gals                   = true,
+        .config_port                = mtk_smi_larb_config_port_gen2_general,
+        .larb_direct_to_common_mask = BIT(2) | BIT(3) | BIT(7),
+                                      /* IPU0 | IPU1 | CCU */
 };
 
 static const struct of_device_id mtk_smi_larb_of_ids[] = {
@@ -269,6 +259,10 @@ static const struct of_device_id mtk_smi_larb_of_ids[] = {
                 .compatible = "mediatek,mt2712-smi-larb",
                 .data = &mtk_smi_larb_mt2712
         },
+        {
+                .compatible = "mediatek,mt8183-smi-larb",
+                .data = &mtk_smi_larb_mt8183
+        },
         {}
 };
 
@@ -279,7 +273,6 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)
         struct device *dev = &pdev->dev;
         struct device_node *smi_node;
         struct platform_device *smi_pdev;
-        int err;
 
         larb = devm_kzalloc(dev, sizeof(*larb), GFP_KERNEL);
         if (!larb)
@@ -298,16 +291,16 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)
         larb->smi.clk_smi = devm_clk_get(dev, "smi");
         if (IS_ERR(larb->smi.clk_smi))
                 return PTR_ERR(larb->smi.clk_smi);
-        larb->smi.dev = dev;
 
-        if (larb->larb_gen->need_larbid) {
-                err = of_property_read_u32(dev->of_node, "mediatek,larb-id",
-                                           &larb->larbid);
-                if (err) {
-                        dev_err(dev, "missing larbid property\n");
-                        return err;
-                }
+        if (larb->larb_gen->has_gals) {
+                /* The larbs may still haven't gals even if the SoC support.*/
+                larb->smi.clk_gals0 = devm_clk_get(dev, "gals");
+                if (PTR_ERR(larb->smi.clk_gals0) == -ENOENT)
+                        larb->smi.clk_gals0 = NULL;
+                else if (IS_ERR(larb->smi.clk_gals0))
+                        return PTR_ERR(larb->smi.clk_gals0);
         }
+        larb->smi.dev = dev;
 
         smi_node = of_parse_phandle(dev->of_node, "mediatek,smi", 0);
         if (!smi_node)
@@ -336,27 +329,86 @@ static int mtk_smi_larb_remove(struct platform_device *pdev)
         return 0;
 }
 
+static int __maybe_unused mtk_smi_larb_resume(struct device *dev)
+{
+        struct mtk_smi_larb *larb = dev_get_drvdata(dev);
+        const struct mtk_smi_larb_gen *larb_gen = larb->larb_gen;
+        int ret;
+
+        /* Power on smi-common. */
+        ret = pm_runtime_get_sync(larb->smi_common_dev);
+        if (ret < 0) {
+                dev_err(dev, "Failed to pm get for smi-common(%d).\n", ret);
+                return ret;
+        }
+
+        ret = mtk_smi_clk_enable(&larb->smi);
+        if (ret < 0) {
+                dev_err(dev, "Failed to enable clock(%d).\n", ret);
+                pm_runtime_put_sync(larb->smi_common_dev);
+                return ret;
+        }
+
+        /* Configure the basic setting for this larb */
+        larb_gen->config_port(dev);
+
+        return 0;
+}
+
+static int __maybe_unused mtk_smi_larb_suspend(struct device *dev)
+{
+        struct mtk_smi_larb *larb = dev_get_drvdata(dev);
+
+        mtk_smi_clk_disable(&larb->smi);
+        pm_runtime_put_sync(larb->smi_common_dev);
+        return 0;
+}
+
+static const struct dev_pm_ops smi_larb_pm_ops = {
+        SET_RUNTIME_PM_OPS(mtk_smi_larb_suspend, mtk_smi_larb_resume, NULL)
+};
+
 static struct platform_driver mtk_smi_larb_driver = {
         .probe  = mtk_smi_larb_probe,
         .remove = mtk_smi_larb_remove,
         .driver = {
                 .name = "mtk-smi-larb",
                 .of_match_table = mtk_smi_larb_of_ids,
+                .pm             = &smi_larb_pm_ops,
         }
 };
 
+static const struct mtk_smi_common_plat mtk_smi_common_gen1 = {
+        .gen = MTK_SMI_GEN1,
+};
+
+static const struct mtk_smi_common_plat mtk_smi_common_gen2 = {
+        .gen = MTK_SMI_GEN2,
+};
+
+static const struct mtk_smi_common_plat mtk_smi_common_mt8183 = {
+        .gen      = MTK_SMI_GEN2,
+        .has_gals = true,
+        .bus_sel  = F_MMU1_LARB(1) | F_MMU1_LARB(2) | F_MMU1_LARB(5) |
+                    F_MMU1_LARB(7),
+};
+
 static const struct of_device_id mtk_smi_common_of_ids[] = {
         {
                 .compatible = "mediatek,mt8173-smi-common",
-                .data = (void *)MTK_SMI_GEN2
+                .data = &mtk_smi_common_gen2,
         },
         {
                 .compatible = "mediatek,mt2701-smi-common",
-                .data = (void *)MTK_SMI_GEN1
+                .data = &mtk_smi_common_gen1,
         },
         {
                 .compatible = "mediatek,mt2712-smi-common",
-                .data = (void *)MTK_SMI_GEN2
+                .data = &mtk_smi_common_gen2,
+        },
+        {
+                .compatible = "mediatek,mt8183-smi-common",
+                .data = &mtk_smi_common_mt8183,
         },
         {}
 };
@@ -366,13 +418,13 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
         struct device *dev = &pdev->dev;
         struct mtk_smi *common;
         struct resource *res;
-        enum mtk_smi_gen smi_gen;
         int ret;
 
         common = devm_kzalloc(dev, sizeof(*common), GFP_KERNEL);
         if (!common)
                 return -ENOMEM;
         common->dev = dev;
+        common->plat = of_device_get_match_data(dev);
 
         common->clk_apb = devm_clk_get(dev, "apb");
         if (IS_ERR(common->clk_apb))
@@ -382,14 +434,23 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
         if (IS_ERR(common->clk_smi))
                 return PTR_ERR(common->clk_smi);
 
+        if (common->plat->has_gals) {
+                common->clk_gals0 = devm_clk_get(dev, "gals0");
+                if (IS_ERR(common->clk_gals0))
+                        return PTR_ERR(common->clk_gals0);
+
+                common->clk_gals1 = devm_clk_get(dev, "gals1");
+                if (IS_ERR(common->clk_gals1))
+                        return PTR_ERR(common->clk_gals1);
+        }
+
         /*
          * for mtk smi gen 1, we need to get the ao(always on) base to config
          * m4u port, and we need to enable the aync clock for transform the smi
          * clock into emi clock domain, but for mtk smi gen2, there's no smi ao
          * base.
          */
-        smi_gen = (enum mtk_smi_gen)of_device_get_match_data(dev);
-        if (smi_gen == MTK_SMI_GEN1) {
+        if (common->plat->gen == MTK_SMI_GEN1) {
                 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
                 common->smi_ao_base = devm_ioremap_resource(dev, res);
                 if (IS_ERR(common->smi_ao_base))
@@ -402,6 +463,11 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
                 ret = clk_prepare_enable(common->clk_async);
                 if (ret)
                         return ret;
+        } else {
+                res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+                common->base = devm_ioremap_resource(dev, res);
+                if (IS_ERR(common->base))
+                        return PTR_ERR(common->base);
         }
         pm_runtime_enable(dev);
         platform_set_drvdata(pdev, common);
@@ -414,12 +480,42 @@ static int mtk_smi_common_remove(struct platform_device *pdev)
         return 0;
 }
 
+static int __maybe_unused mtk_smi_common_resume(struct device *dev)
+{
+        struct mtk_smi *common = dev_get_drvdata(dev);
+        u32 bus_sel = common->plat->bus_sel;
+        int ret;
+
+        ret = mtk_smi_clk_enable(common);
+        if (ret) {
+                dev_err(common->dev, "Failed to enable clock(%d).\n", ret);
+                return ret;
+        }
+
+        if (common->plat->gen == MTK_SMI_GEN2 && bus_sel)
+                writel(bus_sel, common->base + SMI_BUS_SEL);
+        return 0;
+}
+
+static int __maybe_unused mtk_smi_common_suspend(struct device *dev)
+{
+        struct mtk_smi *common = dev_get_drvdata(dev);
+
+        mtk_smi_clk_disable(common);
+        return 0;
+}
+
+static const struct dev_pm_ops smi_common_pm_ops = {
+        SET_RUNTIME_PM_OPS(mtk_smi_common_suspend, mtk_smi_common_resume, NULL)
+};
+
 static struct platform_driver mtk_smi_common_driver = {
         .probe  = mtk_smi_common_probe,
         .remove = mtk_smi_common_remove,
         .driver = {
                 .name = "mtk-smi-common",
                 .of_match_table = mtk_smi_common_of_ids,
+                .pm             = &smi_common_pm_ops,
         }
 };
 
diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index 601cefb5c9d8..050478cabc95 100644
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -729,7 +729,7 @@ static int rk808_remove(struct i2c_client *client)
         return 0;
 }
 
-static int rk8xx_suspend(struct device *dev)
+static int __maybe_unused rk8xx_suspend(struct device *dev)
 {
         struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);
         int ret = 0;
@@ -749,7 +749,7 @@ static int rk8xx_suspend(struct device *dev)
         return ret;
 }
 
-static int rk8xx_resume(struct device *dev)
+static int __maybe_unused rk8xx_resume(struct device *dev)
 {
         struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);
         int ret = 0;
@@ -768,7 +768,7 @@ static int rk8xx_resume(struct device *dev)
 
         return ret;
 }
-SIMPLE_DEV_PM_OPS(rk8xx_pm_ops, rk8xx_suspend, rk8xx_resume);
+static SIMPLE_DEV_PM_OPS(rk8xx_pm_ops, rk8xx_suspend, rk8xx_resume);
 
 static struct i2c_driver rk808_i2c_driver = {
         .driver = {
diff --git a/drivers/misc/lkdtm/bugs.c b/drivers/misc/lkdtm/bugs.c
index 1606658b9b7e..24245ccdba72 100644
--- a/drivers/misc/lkdtm/bugs.c
+++ b/drivers/misc/lkdtm/bugs.c
@@ -22,7 +22,7 @@ struct lkdtm_list {
  * recurse past the end of THREAD_SIZE by default.
  */
 #if defined(CONFIG_FRAME_WARN) && (CONFIG_FRAME_WARN > 0)
-#define REC_STACK_SIZE (CONFIG_FRAME_WARN / 2)
+#define REC_STACK_SIZE (_AC(CONFIG_FRAME_WARN, UL) / 2)
 #else
 #define REC_STACK_SIZE (THREAD_SIZE / 8)
 #endif
@@ -91,7 +91,7 @@ void lkdtm_LOOP(void)
 
 void lkdtm_EXHAUST_STACK(void)
 {
-        pr_info("Calling function with %d frame size to depth %d ...\n",
+        pr_info("Calling function with %lu frame size to depth %d ...\n",
                 REC_STACK_SIZE, recur_count);
         recursive_loop(recur_count);
         pr_info("FAIL: survived without exhausting stack?!\n");
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index 6c0173772162..77f7dff7098d 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -81,6 +81,8 @@
 
 #define MEI_DEV_ID_ICP_LP     0x34E0  /* Ice Lake Point LP */
 
+#define MEI_DEV_ID_TGP_LP     0xA0E0  /* Tiger Lake Point LP */
+
 #define MEI_DEV_ID_MCC        0x4B70  /* Mule Creek Canyon (EHL) */
 #define MEI_DEV_ID_MCC_4      0x4B75  /* Mule Creek Canyon 4 (EHL) */
 
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 57cb68f5cc64..541538eff8b1 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -98,6 +98,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
 
         {MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)},
 
+        {MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH12_CFG)},
+
         {MEI_PCI_DEVICE(MEI_DEV_ID_MCC, MEI_ME_PCH12_CFG)},
         {MEI_PCI_DEVICE(MEI_DEV_ID_MCC_4, MEI_ME_PCH8_CFG)},
 
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index 8840299420e0..5e6be1527571 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -691,7 +691,6 @@ static int vmballoon_alloc_page_list(struct vmballoon *b,
                 }
 
                 if (page) {
-                        vmballoon_mark_page_offline(page, ctl->page_size);
                         /* Success. Add the page to the list and continue. */
                         list_add(&page->lru, &ctl->pages);
                         continue;
@@ -930,7 +929,6 @@ static void vmballoon_release_page_list(struct list_head *page_list,
 
         list_for_each_entry_safe(page, tmp, page_list, lru) {
                 list_del(&page->lru);
-                vmballoon_mark_page_online(page, page_size);
                 __free_pages(page, vmballoon_page_order(page_size));
         }
 
@@ -1005,6 +1003,7 @@ static void vmballoon_enqueue_page_list(struct vmballoon *b,
                                         enum vmballoon_page_size_type page_size)
 {
         unsigned long flags;
+        struct page *page;
 
         if (page_size == VMW_BALLOON_4K_PAGE) {
                 balloon_page_list_enqueue(&b->b_dev_info, pages);
@@ -1014,6 +1013,11 @@ static void vmballoon_enqueue_page_list(struct vmballoon *b,
                  * for the balloon compaction mechanism.
                  */
                 spin_lock_irqsave(&b->b_dev_info.pages_lock, flags);
+
+                list_for_each_entry(page, pages, lru) {
+                        vmballoon_mark_page_offline(page, VMW_BALLOON_2M_PAGE);
+                }
+
                 list_splice_init(pages, &b->huge_pages);
                 __count_vm_events(BALLOON_INFLATE, *n_pages *
                                   vmballoon_page_in_frames(VMW_BALLOON_2M_PAGE));
@@ -1056,6 +1060,8 @@ static void vmballoon_dequeue_page_list(struct vmballoon *b,
         /* 2MB pages */
         spin_lock_irqsave(&b->b_dev_info.pages_lock, flags);
         list_for_each_entry_safe(page, tmp, &b->huge_pages, lru) {
+                vmballoon_mark_page_online(page, VMW_BALLOON_2M_PAGE);
+
                 list_move(&page->lru, pages);
                 if (++i == n_req_pages)
                         break;
diff --git a/drivers/misc/vmw_vmci/vmci_doorbell.c b/drivers/misc/vmw_vmci/vmci_doorbell.c
index bad89b6e0802..345addd9306d 100644
--- a/drivers/misc/vmw_vmci/vmci_doorbell.c
+++ b/drivers/misc/vmw_vmci/vmci_doorbell.c
@@ -310,7 +310,8 @@ int vmci_dbell_host_context_notify(u32 src_cid, struct vmci_handle handle)
 
         entry = container_of(resource, struct dbell_entry, resource);
         if (entry->run_delayed) {
-                schedule_work(&entry->work);
+                if (!schedule_work(&entry->work))
+                        vmci_resource_put(resource);
         } else {
                 entry->notify_cb(entry->client_data);
                 vmci_resource_put(resource);
@@ -361,7 +362,8 @@ static void dbell_fire_entries(u32 notify_idx)
                     atomic_read(&dbell->active) == 1) {
                         if (dbell->run_delayed) {
                                 vmci_resource_get(&dbell->resource);
-                                schedule_work(&dbell->work);
+                                if (!schedule_work(&dbell->work))
+                                        vmci_resource_put(&dbell->resource);
                         } else {
                                 dbell->notify_cb(dbell->client_data);
                         }
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 74e4364bc9fb..09113b9ad679 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -564,7 +564,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
         if (index == EXT_CSD_SANITIZE_START)
                 cmd.sanitize_busy = true;
 
-        err = mmc_wait_for_cmd(host, &cmd, 0);
+        err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);
         if (err)
                 goto out;
 
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index d681e8aaca83..fe914ff5f5d6 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -1292,6 +1292,12 @@ int mmc_attach_sd(struct mmc_host *host)
                         goto err;
         }
 
+        /*
+         * Some SD cards claims an out of spec VDD voltage range. Let's treat
+         * these bits as being in-valid and especially also bit7.
+         */
+        ocr &= ~0x7FFF;
+
         rocr = mmc_select_voltage(host, ocr);
 
         /*
diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c
index 163d1cf4367e..44139fceac24 100644
--- a/drivers/mmc/host/sdhci-cadence.c
+++ b/drivers/mmc/host/sdhci-cadence.c
@@ -369,6 +369,7 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
         host->mmc_host_ops.execute_tuning = sdhci_cdns_execute_tuning;
         host->mmc_host_ops.hs400_enhanced_strobe =
                                 sdhci_cdns_hs400_enhanced_strobe;
+        sdhci_enable_v4_mode(host);
 
         sdhci_get_of_property(pdev);
 
diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
index d4e7e8b7be77..e7d1920729fb 100644
--- a/drivers/mmc/host/sdhci-of-at91.c
+++ b/drivers/mmc/host/sdhci-of-at91.c
@@ -357,6 +357,9 @@ static int sdhci_at91_probe(struct platform_device *pdev)
         pm_runtime_set_autosuspend_delay(&pdev->dev, 50);
         pm_runtime_use_autosuspend(&pdev->dev);
 
+        /* HS200 is broken at this moment */
+        host->quirks2 = SDHCI_QUIRK2_BROKEN_HS200;
+
         ret = sdhci_add_host(host);
         if (ret)
                 goto pm_runtime_disable;
diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
index 83a4767ca680..d07b9793380f 100644
--- a/drivers/mmc/host/sdhci-sprd.c
+++ b/drivers/mmc/host/sdhci-sprd.c
@@ -217,10 +217,11 @@ static inline void _sdhci_sprd_set_clock(struct sdhci_host *host,
         struct sdhci_sprd_host *sprd_host = TO_SPRD_HOST(host);
         u32 div, val, mask;
 
-        div = sdhci_sprd_calc_div(sprd_host->base_rate, clk);
+        sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
 
-        clk |= ((div & 0x300) >> 2) | ((div & 0xFF) << 8);
-        sdhci_enable_clk(host, clk);
+        div = sdhci_sprd_calc_div(sprd_host->base_rate, clk);
+        div = ((div & 0x300) >> 2) | ((div & 0xFF) << 8);
+        sdhci_enable_clk(host, div);
 
         /* enable auto gate sdhc_enable_auto_gate */
         val = sdhci_readl(host, SDHCI_SPRD_REG_32_BUSY_POSI);
@@ -373,6 +374,11 @@ static unsigned int sdhci_sprd_get_max_timeout_count(struct sdhci_host *host)
         return 1 << 31;
 }
 
+static unsigned int sdhci_sprd_get_ro(struct sdhci_host *host)
+{
+        return 0;
+}
+
 static struct sdhci_ops sdhci_sprd_ops = {
         .read_l = sdhci_sprd_readl,
         .write_l = sdhci_sprd_writel,
@@ -385,6 +391,7 @@ static struct sdhci_ops sdhci_sprd_ops = {
         .set_uhs_signaling = sdhci_sprd_set_uhs_signaling,
         .hw_reset = sdhci_sprd_hw_reset,
         .get_max_timeout_count = sdhci_sprd_get_max_timeout_count,
+        .get_ro = sdhci_sprd_get_ro,
 };
 
 static void sdhci_sprd_request(struct mmc_host *mmc, struct mmc_request *mrq)
@@ -501,9 +508,12 @@ static void sdhci_sprd_phy_param_parse(struct sdhci_sprd_host *sprd_host,
 }
 
 static const struct sdhci_pltfm_data sdhci_sprd_pdata = {
-        .quirks = SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK,
+        .quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION |
+                  SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
+                  SDHCI_QUIRK_MISSING_CAPS,
         .quirks2 = SDHCI_QUIRK2_BROKEN_HS200 |
-                   SDHCI_QUIRK2_USE_32BIT_BLK_CNT,
+                   SDHCI_QUIRK2_USE_32BIT_BLK_CNT |
+                   SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
         .ops = &sdhci_sprd_ops,
 };
 
@@ -605,6 +615,16 @@ static int sdhci_sprd_probe(struct platform_device *pdev)
 
         sdhci_enable_v4_mode(host);
 
+        /*
+         * Supply the existing CAPS, but clear the UHS-I modes. This
+         * will allow these modes to be specified only by device
+         * tree properties through mmc_of_parse().
+         */
+        host->caps = sdhci_readl(host, SDHCI_CAPABILITIES);
+        host->caps1 = sdhci_readl(host, SDHCI_CAPABILITIES_1);
+        host->caps1 &= ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_SDR104 |
+                         SDHCI_SUPPORT_DDR50);
+
         ret = sdhci_setup_host(host);
         if (ret)
                 goto pm_runtime_disable;
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index f4d4761cf20a..02d8f524bb9e 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -258,6 +258,16 @@ static void tegra210_sdhci_writew(struct sdhci_host *host, u16 val, int reg)
         }
 }
 
+static unsigned int tegra_sdhci_get_ro(struct sdhci_host *host)
+{
+        /*
+         * Write-enable shall be assumed if GPIO is missing in a board's
+         * device-tree because SDHCI's WRITE_PROTECT bit doesn't work on
+         * Tegra.
+         */
+        return mmc_gpio_get_ro(host->mmc);
+}
+
 static bool tegra_sdhci_is_pad_and_regulator_valid(struct sdhci_host *host)
 {
         struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
@@ -1224,6 +1234,7 @@ static const struct cqhci_host_ops sdhci_tegra_cqhci_ops = {
 };
 
 static const struct sdhci_ops tegra_sdhci_ops = {
+        .get_ro     = tegra_sdhci_get_ro,
         .read_w     = tegra_sdhci_readw,
         .write_l    = tegra_sdhci_writel,
         .set_clock  = tegra_sdhci_set_clock,
@@ -1279,6 +1290,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra30 = {
 };
 
 static const struct sdhci_ops tegra114_sdhci_ops = {
+        .get_ro     = tegra_sdhci_get_ro,
         .read_w     = tegra_sdhci_readw,
         .write_w    = tegra_sdhci_writew,
         .write_l    = tegra_sdhci_writel,
@@ -1332,6 +1344,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra124 = {
 };
 
 static const struct sdhci_ops tegra210_sdhci_ops = {
+        .get_ro     = tegra_sdhci_get_ro,
         .read_w     = tegra_sdhci_readw,
         .write_w    = tegra210_sdhci_writew,
         .write_l    = tegra_sdhci_writel,
@@ -1366,6 +1379,7 @@ static const struct sdhci_tegra_soc_data soc_data_tegra210 = {
 };
 
 static const struct sdhci_ops tegra186_sdhci_ops = {
+        .get_ro     = tegra_sdhci_get_ro,
         .read_w     = tegra_sdhci_readw,
         .write_l    = tegra_sdhci_writel,
         .set_clock  = tegra_sdhci_set_clock,
diff --git a/drivers/mtd/hyperbus/Kconfig b/drivers/mtd/hyperbus/Kconfig
index b4e3caf7d799..a4d8968d133d 100644
--- a/drivers/mtd/hyperbus/Kconfig
+++ b/drivers/mtd/hyperbus/Kconfig
@@ -1,5 +1,6 @@
 menuconfig MTD_HYPERBUS
         tristate "HyperBus support"
+        depends on HAS_IOMEM
         select MTD_CFI
         select MTD_MAP_BANK_WIDTH_2
         select MTD_CFI_AMDSTD
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 895510d40ce4..47602af4ee34 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -81,6 +81,7 @@ static int sa1100_probe_subdev(struct sa_subdev_info *subdev, struct resource *r
         default:
                 printk(KERN_WARNING "SA1100 flash: unknown base address "
                        "0x%08lx, assuming CS0\n", phys);
+                /* Fall through */
 
         case SA1100_CS0_PHYS:
                 subdev->map.bankwidth = (MSC0 & MSC_RBW) ? 2 : 4;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 02fd7822c14a..931d9d935686 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1126,6 +1126,8 @@ static void bond_compute_features(struct bonding *bond)
 done:
         bond_dev->vlan_features = vlan_features;
         bond_dev->hw_enc_features = enc_features | NETIF_F_GSO_ENCAP_ALL |
+                                    NETIF_F_HW_VLAN_CTAG_TX |
+                                    NETIF_F_HW_VLAN_STAG_TX |
                                     NETIF_F_GSO_UDP_L4;
         bond_dev->mpls_features = mpls_features;
         bond_dev->gso_max_segs = gso_max_segs;
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 3811fdbda13e..28c963a21dac 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -478,6 +478,7 @@ static void bcm_sf2_sw_validate(struct dsa_switch *ds, int port,
                                 unsigned long *supported,
                                 struct phylink_link_state *state)
 {
+        struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
         __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
 
         if (!phy_interface_mode_is_rgmii(state->interface) &&
@@ -487,8 +488,10 @@ static void bcm_sf2_sw_validate(struct dsa_switch *ds, int port,
             state->interface != PHY_INTERFACE_MODE_INTERNAL &&
             state->interface != PHY_INTERFACE_MODE_MOCA) {
                 bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);
-                dev_err(ds->dev,
-                        "Unsupported interface: %d\n", state->interface);
+                if (port != core_readl(priv, CORE_IMP0_PRT_ID))
+                        dev_err(ds->dev,
+                                "Unsupported interface: %d for port %d\n",
+                                state->interface, port);
                 return;
         }
 
@@ -526,6 +529,9 @@ static void bcm_sf2_sw_mac_config(struct dsa_switch *ds, int port,
         u32 id_mode_dis = 0, port_mode;
         u32 reg, offset;
 
+        if (port == core_readl(priv, CORE_IMP0_PRT_ID))
+                return;
+
         if (priv->type == BCM7445_DEVICE_ID)
                 offset = CORE_STS_OVERRIDE_GMIIP_PORT(port);
         else
diff --git a/drivers/net/dsa/microchip/ksz9477_spi.c b/drivers/net/dsa/microchip/ksz9477_spi.c
index 5a9e27b337a8..098b01e4ed1a 100644
--- a/drivers/net/dsa/microchip/ksz9477_spi.c
+++ b/drivers/net/dsa/microchip/ksz9477_spi.c
@@ -81,6 +81,7 @@ static const struct of_device_id ksz9477_dt_ids[] = {
         { .compatible = "microchip,ksz9897" },
         { .compatible = "microchip,ksz9893" },
         { .compatible = "microchip,ksz9563" },
+        { .compatible = "microchip,ksz8563" },
         {},
 };
 MODULE_DEVICE_TABLE(of, ksz9477_dt_ids);
diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index ee7096d8af07..72ec250b9540 100644
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -128,6 +128,7 @@ static inline void ksz_pwrite32(struct ksz_device *dev, int port, int offset,
 
 #define KSZ_REGMAP_ENTRY(width, swp, regbits, regpad, regalign)         \
         {                                                               \
+                .name = #width,                                         \
                 .val_bits = (width),                                    \
                 .reg_stride = (width) / 8,                              \
                 .reg_bits = (regbits) + (regalign),                     \
diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index d073baffc20b..df976b259e43 100644
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -1223,12 +1223,8 @@ static int sja1105_fdb_dump(struct dsa_switch *ds, int port,
 {
         struct sja1105_private *priv = ds->priv;
         struct device *dev = ds->dev;
-        u16 rx_vid, tx_vid;
         int i;
 
-        rx_vid = dsa_8021q_rx_vid(ds, port);
-        tx_vid = dsa_8021q_tx_vid(ds, port);
-
         for (i = 0; i < SJA1105_MAX_L2_LOOKUP_COUNT; i++) {
                 struct sja1105_l2_lookup_entry l2_lookup = {0};
                 u8 macaddr[ETH_ALEN];
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
index b41f23679a08..7ce9c69e9c44 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
@@ -469,13 +469,19 @@ static int __init xgbe_mod_init(void)
 
         ret = xgbe_platform_init();
         if (ret)
-                return ret;
+                goto err_platform_init;
 
         ret = xgbe_pci_init();
         if (ret)
-                return ret;
+                goto err_pci_init;
 
         return 0;
+
+err_pci_init:
+        xgbe_platform_exit();
+err_platform_init:
+        unregister_netdevice_notifier(&xgbe_netdev_notifier);
+        return ret;
 }
 
 static void __exit xgbe_mod_exit(void)
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_filters.c b/drivers/net/ethernet/aquantia/atlantic/aq_filters.c
index 440690b18734..aee827f07c16 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_filters.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_filters.c
@@ -431,7 +431,8 @@ int aq_del_fvlan_by_vlan(struct aq_nic_s *aq_nic, u16 vlan_id)
                 if (be16_to_cpu(rule->aq_fsp.h_ext.vlan_tci) == vlan_id)
                         break;
         }
-        if (rule && be16_to_cpu(rule->aq_fsp.h_ext.vlan_tci) == vlan_id) {
+        if (rule && rule->type == aq_rx_filter_vlan &&
+            be16_to_cpu(rule->aq_fsp.h_ext.vlan_tci) == vlan_id) {
                 struct ethtool_rxnfc cmd;
 
                 cmd.fs.location = rule->aq_fsp.location;
@@ -843,7 +844,7 @@ int aq_filters_vlans_update(struct aq_nic_s *aq_nic)
                 return err;
 
         if (aq_nic->ndev->features & NETIF_F_HW_VLAN_CTAG_FILTER) {
-                if (hweight < AQ_VLAN_MAX_FILTERS && hweight > 0) {
+                if (hweight <= AQ_VLAN_MAX_FILTERS && hweight > 0) {
                         err = aq_hw_ops->hw_filter_vlan_ctrl(aq_hw,
                                 !(aq_nic->packet_filter & IFF_PROMISC));
                         aq_nic->aq_nic_cfg.is_vlan_force_promisc = false;
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c
index 100722ad5c2d..b4a0fb281e69 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c
@@ -61,6 +61,10 @@ static int aq_ndev_open(struct net_device *ndev)
         if (err < 0)
                 goto err_exit;
 
+        err = aq_filters_vlans_update(aq_nic);
+        if (err < 0)
+                goto err_exit;
+
         err = aq_nic_start(aq_nic);
         if (err < 0)
                 goto err_exit;
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
index e1392766e21e..8f66e7817811 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -393,7 +393,7 @@ int aq_nic_start(struct aq_nic_s *self)
                                                    self->aq_nic_cfg.link_irq_vec);
                         err = request_threaded_irq(irqvec, NULL,
                                                    aq_linkstate_threaded_isr,
-                                                   IRQF_SHARED,
+                                                   IRQF_SHARED | IRQF_ONESHOT,
                                                    self->ndev->name, self);
                         if (err < 0)
                                 goto err_exit;
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
index 715685aa48c3..28892b8acd0e 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
@@ -86,6 +86,7 @@ static int aq_vec_poll(struct napi_struct *napi, int budget)
                         }
                 }
 
+err_exit:
                 if (!was_tx_cleaned)
                         work_done = budget;
 
@@ -95,7 +96,7 @@ static int aq_vec_poll(struct napi_struct *napi, int budget)
                                         1U << self->aq_ring_param.vec_idx);
                 }
         }
-err_exit:
+
         return work_done;
 }
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index e47ea92e2ae3..d10b421ed1f1 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -3057,12 +3057,13 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link)
         /* if VF indicate to PF this function is going down (PF will delete sp
          * elements and clear initializations
          */
-        if (IS_VF(bp))
+        if (IS_VF(bp)) {
+                bnx2x_clear_vlan_info(bp);
                 bnx2x_vfpf_close_vf(bp);
-        else if (unload_mode != UNLOAD_RECOVERY)
+        } else if (unload_mode != UNLOAD_RECOVERY) {
                 /* if this is a normal/close unload need to clean up chip*/
                 bnx2x_chip_cleanup(bp, unload_mode, keep_link);
-        else {
+        } else {
                 /* Send the UNLOAD_REQUEST to the MCP */
                 bnx2x_send_unload_req(bp, unload_mode);
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
index c2f6e44e9a3f..8b08cb18e363 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
@@ -425,6 +425,8 @@ void bnx2x_set_reset_global(struct bnx2x *bp);
 void bnx2x_disable_close_the_gate(struct bnx2x *bp);
 int bnx2x_init_hw_func_cnic(struct bnx2x *bp);
 
+void bnx2x_clear_vlan_info(struct bnx2x *bp);
+
 /**
  * bnx2x_sp_event - handle ramrods completion.
  *
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 2cc14db8f0ec..192ff8d5da32 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -8482,11 +8482,21 @@ int bnx2x_set_vlan_one(struct bnx2x *bp, u16 vlan,
         return rc;
 }
 
+void bnx2x_clear_vlan_info(struct bnx2x *bp)
+{
+        struct bnx2x_vlan_entry *vlan;
+
+        /* Mark that hw forgot all entries */
+        list_for_each_entry(vlan, &bp->vlan_reg, link)
+                vlan->hw = false;
+
+        bp->vlan_cnt = 0;
+}
+
 static int bnx2x_del_all_vlans(struct bnx2x *bp)
 {
         struct bnx2x_vlan_mac_obj *vlan_obj = &bp->sp_objs[0].vlan_obj;
         unsigned long ramrod_flags = 0, vlan_flags = 0;
-        struct bnx2x_vlan_entry *vlan;
         int rc;
 
         __set_bit(RAMROD_COMP_WAIT, &ramrod_flags);
@@ -8495,10 +8505,7 @@ static int bnx2x_del_all_vlans(struct bnx2x *bp)
         if (rc)
                 return rc;
 
-        /* Mark that hw forgot all entries */
-        list_for_each_entry(vlan, &bp->vlan_reg, link)
-                vlan->hw = false;
-        bp->vlan_cnt = 0;
+        bnx2x_clear_vlan_info(bp);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 7070349915bc..8dce4069472b 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -2021,9 +2021,9 @@ static void __bnxt_poll_work_done(struct bnxt *bp, struct bnxt_napi *bnapi)
         if (bnapi->events & BNXT_RX_EVENT) {
                 struct bnxt_rx_ring_info *rxr = bnapi->rx_ring;
 
-                bnxt_db_write(bp, &rxr->rx_db, rxr->rx_prod);
                 if (bnapi->events & BNXT_AGG_EVENT)
                         bnxt_db_write(bp, &rxr->rx_agg_db, rxr->rx_agg_prod);
+                bnxt_db_write(bp, &rxr->rx_db, rxr->rx_prod);
         }
         bnapi->events = 0;
 }
@@ -5064,6 +5064,7 @@ static void bnxt_set_db(struct bnxt *bp, struct bnxt_db_info *db, u32 ring_type,
 
 static int bnxt_hwrm_ring_alloc(struct bnxt *bp)
 {
+        bool agg_rings = !!(bp->flags & BNXT_FLAG_AGG_RINGS);
         int i, rc = 0;
         u32 type;
 
@@ -5139,7 +5140,9 @@ static int bnxt_hwrm_ring_alloc(struct bnxt *bp)
                 if (rc)
                         goto err_out;
                 bnxt_set_db(bp, &rxr->rx_db, type, map_idx, ring->fw_ring_id);
-                bnxt_db_write(bp, &rxr->rx_db, rxr->rx_prod);
+                /* If we have agg rings, post agg buffers first. */
+                if (!agg_rings)
+                        bnxt_db_write(bp, &rxr->rx_db, rxr->rx_prod);
                 bp->grp_info[map_idx].rx_fw_ring_id = ring->fw_ring_id;
                 if (bp->flags & BNXT_FLAG_CHIP_P5) {
                         struct bnxt_cp_ring_info *cpr = &bnapi->cp_ring;
@@ -5158,7 +5161,7 @@ static int bnxt_hwrm_ring_alloc(struct bnxt *bp)
                 }
         }
 
-        if (bp->flags & BNXT_FLAG_AGG_RINGS) {
+        if (agg_rings) {
                 type = HWRM_RING_ALLOC_AGG;
                 for (i = 0; i < bp->rx_nr_rings; i++) {
                         struct bnxt_rx_ring_info *rxr = &bp->rx_ring[i];
@@ -5174,6 +5177,7 @@ static int bnxt_hwrm_ring_alloc(struct bnxt *bp)
                         bnxt_set_db(bp, &rxr->rx_agg_db, type, map_idx,
                                     ring->fw_ring_id);
                         bnxt_db_write(bp, &rxr->rx_agg_db, rxr->rx_agg_prod);
+                        bnxt_db_write(bp, &rxr->rx_db, rxr->rx_prod);
                         bp->grp_info[grp_idx].agg_fw_ring_id = ring->fw_ring_id;
                 }
         }
@@ -7016,19 +7020,29 @@ static void bnxt_hwrm_clear_vnic_rss(struct bnxt *bp)
                 bnxt_hwrm_vnic_set_rss(bp, i, false);
 }
 
-static void bnxt_hwrm_resource_free(struct bnxt *bp, bool close_path,
-                                    bool irq_re_init)
+static void bnxt_clear_vnic(struct bnxt *bp)
 {
-        if (bp->vnic_info) {
-                bnxt_hwrm_clear_vnic_filter(bp);
+        if (!bp->vnic_info)
+                return;
+
+        bnxt_hwrm_clear_vnic_filter(bp);
+        if (!(bp->flags & BNXT_FLAG_CHIP_P5)) {
                 /* clear all RSS setting before free vnic ctx */
                 bnxt_hwrm_clear_vnic_rss(bp);
                 bnxt_hwrm_vnic_ctx_free(bp);
-                /* before free the vnic, undo the vnic tpa settings */
-                if (bp->flags & BNXT_FLAG_TPA)
-                        bnxt_set_tpa(bp, false);
-                bnxt_hwrm_vnic_free(bp);
         }
+        /* before free the vnic, undo the vnic tpa settings */
+        if (bp->flags & BNXT_FLAG_TPA)
+                bnxt_set_tpa(bp, false);
+        bnxt_hwrm_vnic_free(bp);
+        if (bp->flags & BNXT_FLAG_CHIP_P5)
+                bnxt_hwrm_vnic_ctx_free(bp);
+}
+
+static void bnxt_hwrm_resource_free(struct bnxt *bp, bool close_path,
+                                    bool irq_re_init)
+{
+        bnxt_clear_vnic(bp);
         bnxt_hwrm_ring_free(bp, close_path);
         bnxt_hwrm_ring_grp_free(bp);
         if (irq_re_init) {
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index 549c90d3e465..c05d663212b2 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -98,10 +98,13 @@ static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,
         if (idx)
                 req->dimensions = cpu_to_le16(1);
 
-        if (req->req_type == cpu_to_le16(HWRM_NVM_SET_VARIABLE))
+        if (req->req_type == cpu_to_le16(HWRM_NVM_SET_VARIABLE)) {
                 memcpy(data_addr, buf, bytesize);
-
-        rc = hwrm_send_message(bp, msg, msg_len, HWRM_CMD_TIMEOUT);
+                rc = hwrm_send_message(bp, msg, msg_len, HWRM_CMD_TIMEOUT);
+        } else {
+                rc = hwrm_send_message_silent(bp, msg, msg_len,
+                                              HWRM_CMD_TIMEOUT);
+        }
         if (!rc && req->req_type == cpu_to_le16(HWRM_NVM_GET_VARIABLE))
                 memcpy(buf, data_addr, bytesize);
 
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index c7ee63d69679..8445a0cce849 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -2016,21 +2016,19 @@ static int bnxt_flash_package_from_file(struct net_device *dev,
         mutex_lock(&bp->hwrm_cmd_lock);
         hwrm_err = _hwrm_send_message(bp, &install, sizeof(install),
                                       INSTALL_PACKAGE_TIMEOUT);
-        if (hwrm_err)
-                goto flash_pkg_exit;
-
-        if (resp->error_code) {
+        if (hwrm_err) {
                 u8 error_code = ((struct hwrm_err_output *)resp)->cmd_err;
 
-                if (error_code == NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR) {
+                if (resp->error_code && error_code ==
+                    NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR) {
                         install.flags |= cpu_to_le16(
                                NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG);
                         hwrm_err = _hwrm_send_message(bp, &install,
                                                       sizeof(install),
                                                       INSTALL_PACKAGE_TIMEOUT);
-                        if (hwrm_err)
-                                goto flash_pkg_exit;
                 }
+                if (hwrm_err)
+                        goto flash_pkg_exit;
         }
 
         if (resp->result) {
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
index 6fe4a7174271..dd621f6bd127 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
@@ -1236,7 +1236,7 @@ static int __bnxt_tc_del_flow(struct bnxt *bp,
 static void bnxt_tc_set_flow_dir(struct bnxt *bp, struct bnxt_tc_flow *flow,
                                  u16 src_fid)
 {
-        flow->dir = (bp->pf.fw_fid == src_fid) ? BNXT_DIR_RX : BNXT_DIR_TX;
+        flow->l2_key.dir = (bp->pf.fw_fid == src_fid) ? BNXT_DIR_RX : BNXT_DIR_TX;
 }
 
 static void bnxt_tc_set_src_fid(struct bnxt *bp, struct bnxt_tc_flow *flow,
@@ -1285,9 +1285,7 @@ static int bnxt_tc_add_flow(struct bnxt *bp, u16 src_fid,
                 goto free_node;
 
         bnxt_tc_set_src_fid(bp, flow, src_fid);
-
-        if (bp->fw_cap & BNXT_FW_CAP_OVS_64BIT_HANDLE)
-                bnxt_tc_set_flow_dir(bp, flow, src_fid);
+        bnxt_tc_set_flow_dir(bp, flow, flow->src_fid);
 
         if (!bnxt_tc_can_offload(bp, flow)) {
                 rc = -EOPNOTSUPP;
@@ -1407,7 +1405,7 @@ static void bnxt_fill_cfa_stats_req(struct bnxt *bp,
                  * 2. 15th bit of flow_handle must specify the flow
                  *    direction (TX/RX).
                  */
-                if (flow_node->flow.dir == BNXT_DIR_RX)
+                if (flow_node->flow.l2_key.dir == BNXT_DIR_RX)
                         handle = CFA_FLOW_INFO_REQ_FLOW_HANDLE_DIR_RX |
                                  CFA_FLOW_INFO_REQ_FLOW_HANDLE_MAX_MASK;
                 else
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h
index ffec57d1a5ec..4f05305052f2 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h
@@ -23,6 +23,9 @@ struct bnxt_tc_l2_key {
         __be16          inner_vlan_tci;
         __be16          ether_type;
         u8              num_vlans;
+        u8              dir;
+#define BNXT_DIR_RX     1
+#define BNXT_DIR_TX     0
 };
 
 struct bnxt_tc_l3_key {
@@ -98,9 +101,6 @@ struct bnxt_tc_flow {
 
         /* flow applicable to pkts ingressing on this fid */
         u16                             src_fid;
-        u8                              dir;
-#define BNXT_DIR_RX     1
-#define BNXT_DIR_TX     0
         struct bnxt_tc_l2_key           l2_key;
         struct bnxt_tc_l2_key           l2_mask;
         struct bnxt_tc_l3_key           l3_key;
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index d3a0b614dbfa..b22196880d6d 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1124,6 +1124,7 @@ static const struct ethtool_ops bcmgenet_ethtool_ops = {
         .set_coalesce           = bcmgenet_set_coalesce,
         .get_link_ksettings     = bcmgenet_get_link_ksettings,
         .set_link_ksettings     = bcmgenet_set_link_ksettings,
+        .get_ts_info            = ethtool_op_get_ts_info,
 };
 
 /* Power down the unimac, based on mode. */
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 5ca17e62dc3e..35b59b5edf0f 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -4154,7 +4154,7 @@ static const struct of_device_id macb_dt_ids[] = {
         { .compatible = "cdns,emac", .data = &emac_config },
         { .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config},
         { .compatible = "cdns,zynq-gem", .data = &zynq_config },
-        { .compatible = "sifive,fu540-macb", .data = &fu540_c000_config },
+        { .compatible = "sifive,fu540-c000-gem", .data = &fu540_c000_config },
         { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, macb_dt_ids);
diff --git a/drivers/net/ethernet/cavium/common/cavium_ptp.c b/drivers/net/ethernet/cavium/common/cavium_ptp.c
index 73632b843749..b821c9e1604c 100644
--- a/drivers/net/ethernet/cavium/common/cavium_ptp.c
+++ b/drivers/net/ethernet/cavium/common/cavium_ptp.c
@@ -10,7 +10,7 @@
 
 #include "cavium_ptp.h"
 
-#define DRV_NAME        "Cavium PTP Driver"
+#define DRV_NAME "cavium_ptp"
 
 #define PCI_DEVICE_ID_CAVIUM_PTP        0xA00C
 #define PCI_DEVICE_ID_CAVIUM_RST        0xA00E
diff --git a/drivers/net/ethernet/cavium/liquidio/request_manager.c b/drivers/net/ethernet/cavium/liquidio/request_manager.c
index 032224178b64..6dd65f9b347c 100644
--- a/drivers/net/ethernet/cavium/liquidio/request_manager.c
+++ b/drivers/net/ethernet/cavium/liquidio/request_manager.c
@@ -237,8 +237,10 @@ int octeon_setup_iq(struct octeon_device *oct,
         }
 
         oct->num_iqs++;
-        if (oct->fn_list.enable_io_queues(oct))
+        if (oct->fn_list.enable_io_queues(oct)) {
+                octeon_delete_instr_queue(oct, iq_no);
                 return 1;
+        }
 
         return 0;
 }
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
index 02959035ed3f..d692251ee252 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
@@ -3236,8 +3236,10 @@ static ssize_t blocked_fl_write(struct file *filp, const char __user *ubuf,
                 return -ENOMEM;
 
         err = bitmap_parse_user(ubuf, count, t, adap->sge.egr_sz);
-        if (err)
+        if (err) {
+                kvfree(t);
                 return err;
+        }
 
         bitmap_copy(adap->sge.blocked_fl, t, adap->sge.egr_sz);
         kvfree(t);
diff --git a/drivers/net/ethernet/ezchip/nps_enet.h b/drivers/net/ethernet/ezchip/nps_enet.h
index 133acca0bf31..092da2d90026 100644
--- a/drivers/net/ethernet/ezchip/nps_enet.h
+++ b/drivers/net/ethernet/ezchip/nps_enet.h
@@ -167,7 +167,7 @@ struct nps_enet_priv {
 };
 
 /**
- * nps_reg_set - Sets ENET register with provided value.
+ * nps_enet_reg_set - Sets ENET register with provided value.
  * @priv:       Pointer to EZchip ENET private data structure.
  * @reg:        Register offset from base address.
  * @value:      Value to set in register.
@@ -179,7 +179,7 @@ static inline void nps_enet_reg_set(struct nps_enet_priv *priv,
 }
 
 /**
- * nps_reg_get - Gets value of specified ENET register.
+ * nps_enet_reg_get - Gets value of specified ENET register.
  * @priv:       Pointer to EZchip ENET private data structure.
  * @reg:        Register offset from base address.
  *
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c b/drivers/net/ethernet/freescale/enetc/enetc_ptp.c
index 2fd2586e42bf..bc594892507a 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_ptp.c
@@ -82,7 +82,7 @@ static int enetc_ptp_probe(struct pci_dev *pdev,
         n = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSIX);
         if (n != 1) {
                 err = -EPERM;
-                goto err_irq;
+                goto err_irq_vectors;
         }
 
         ptp_qoriq->irq = pci_irq_vector(pdev, 0);
@@ -107,6 +107,8 @@ static int enetc_ptp_probe(struct pci_dev *pdev,
 err_no_clock:
         free_irq(ptp_qoriq->irq, ptp_qoriq);
 err_irq:
+        pci_free_irq_vectors(pdev);
+err_irq_vectors:
         iounmap(base);
 err_ioremap:
         kfree(ptp_qoriq);
@@ -125,6 +127,7 @@ static void enetc_ptp_remove(struct pci_dev *pdev)
 
         enetc_phc_index = -1;
         ptp_qoriq_free(ptp_qoriq);
+        pci_free_irq_vectors(pdev);
         kfree(ptp_qoriq);
 
         pci_release_mem_regions(pdev);
diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
index 497298752381..aca95f64bde8 100644
--- a/drivers/net/ethernet/google/gve/gve_main.c
+++ b/drivers/net/ethernet/google/gve/gve_main.c
@@ -50,7 +50,7 @@ static void gve_get_stats(struct net_device *dev, struct rtnl_link_stats64 *s)
                                   u64_stats_fetch_begin(&priv->tx[ring].statss);
                                 s->tx_packets += priv->tx[ring].pkt_done;
                                 s->tx_bytes += priv->tx[ring].bytes_done;
-                        } while (u64_stats_fetch_retry(&priv->rx[ring].statss,
+                        } while (u64_stats_fetch_retry(&priv->tx[ring].statss,
                                                        start));
                 }
         }
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index d654c234aaf7..c5be4ebd8437 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1605,7 +1605,7 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id)
         struct net_device *netdev;
         struct ibmveth_adapter *adapter;
         unsigned char *mac_addr_p;
-        unsigned int *mcastFilterSize_p;
+        __be32 *mcastFilterSize_p;
         long ret;
         unsigned long ret_attr;
 
@@ -1627,8 +1627,9 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id)
                 return -EINVAL;
         }
 
-        mcastFilterSize_p = (unsigned int *)vio_get_attribute(dev,
-                                                VETH_MCAST_FILTER_SIZE, NULL);
+        mcastFilterSize_p = (__be32 *)vio_get_attribute(dev,
+                                                        VETH_MCAST_FILTER_SIZE,
+                                                        NULL);
         if (!mcastFilterSize_p) {
                 dev_err(&dev->dev, "Can't find VETH_MCAST_FILTER_SIZE "
                         "attribute\n");
@@ -1645,7 +1646,7 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id)
 
         adapter->vdev = dev;
         adapter->netdev = netdev;
-        adapter->mcastFilterSize = *mcastFilterSize_p;
+        adapter->mcastFilterSize = be32_to_cpu(*mcastFilterSize_p);
         adapter->pool_config = 0;
 
         netif_napi_add(netdev, &adapter->napi, ibmveth_poll, 16);
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 3da680073265..fa4bb940665c 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1568,6 +1568,8 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
                 lpar_rc = send_subcrq_indirect(adapter, handle_array[queue_num],
                                                (u64)tx_buff->indir_dma,
                                                (u64)num_entries);
+                dma_unmap_single(dev, tx_buff->indir_dma,
+                                 sizeof(tx_buff->indir_arr), DMA_TO_DEVICE);
         } else {
                 tx_buff->num_entries = num_entries;
                 lpar_rc = send_subcrq(adapter, handle_array[queue_num],
@@ -1981,6 +1983,10 @@ static void __ibmvnic_reset(struct work_struct *work)
 
         rwi = get_next_rwi(adapter);
         while (rwi) {
+                if (adapter->state == VNIC_REMOVING ||
+                    adapter->state == VNIC_REMOVED)
+                        goto out;
+
                 if (adapter->force_reset_recovery) {
                         adapter->force_reset_recovery = false;
                         rc = do_hard_reset(adapter, rwi, reset_state);
@@ -2005,7 +2011,7 @@ static void __ibmvnic_reset(struct work_struct *work)
                 netdev_dbg(adapter->netdev, "Reset failed\n");
                 free_all_rwi(adapter);
         }
-
+out:
         adapter->resetting = false;
         if (we_lock_rtnl)
                 rtnl_unlock();
@@ -2788,7 +2794,6 @@ static int ibmvnic_complete_tx(struct ibmvnic_adapter *adapter,
         union sub_crq *next;
         int index;
         int i, j;
-        u8 *first;
 
 restart_loop:
         while (pending_scrq(adapter, scrq)) {
@@ -2818,14 +2823,6 @@ restart_loop:
 
                                 txbuff->data_dma[j] = 0;
                         }
-                        /* if sub_crq was sent indirectly */
-                        first = &txbuff->indir_arr[0].generic.first;
-                        if (*first == IBMVNIC_CRQ_CMD) {
-                                dma_unmap_single(dev, txbuff->indir_dma,
-                                                 sizeof(txbuff->indir_arr),
-                                                 DMA_TO_DEVICE);
-                                *first = 0;
-                        }
 
                         if (txbuff->last_frag) {
                                 dev_kfree_skb_any(txbuff->skb);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index cbaf712d6529..7882148abb43 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7897,11 +7897,8 @@ static void ixgbe_service_task(struct work_struct *work)
                 return;
         }
         if (ixgbe_check_fw_error(adapter)) {
-                if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
-                        rtnl_lock();
+                if (!test_bit(__IXGBE_DOWN, &adapter->state))
                         unregister_netdev(adapter->netdev);
-                        rtnl_unlock();
-                }
                 ixgbe_service_event_complete(adapter);
                 return;
         }
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index a01c75ede871..e0363870f3a5 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4931,6 +4931,13 @@ static const struct dmi_system_id msi_blacklist[] = {
                         DMI_MATCH(DMI_BOARD_NAME, "P6T"),
                 },
         },
+        {
+                .ident = "ASUS P6X",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+                        DMI_MATCH(DMI_BOARD_NAME, "P6X"),
+                },
+        },
         {}
 };
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 6c01314e87b0..db3552f2d087 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -1187,7 +1187,7 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
         err = mlx4_qp_alloc(mdev->dev, priv->base_qpn, rss_map->indir_qp);
         if (err) {
                 en_err(priv, "Failed to allocate RSS indirection QP\n");
-                goto rss_err;
+                goto qp_alloc_err;
         }
 
         rss_map->indir_qp->event = mlx4_en_sqp_event;
@@ -1241,6 +1241,7 @@ indir_err:
                        MLX4_QP_STATE_RST, NULL, 0, 0, rss_map->indir_qp);
         mlx4_qp_remove(mdev->dev, rss_map->indir_qp);
         mlx4_qp_free(mdev->dev, rss_map->indir_qp);
+qp_alloc_err:
         kfree(rss_map->indir_qp);
         rss_map->indir_qp = NULL;
 rss_err:
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index ce1be2a84231..65bec19a438f 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -184,8 +184,13 @@ static inline int mlx5e_get_max_num_channels(struct mlx5_core_dev *mdev)
 
 struct mlx5e_tx_wqe {
         struct mlx5_wqe_ctrl_seg ctrl;
-        struct mlx5_wqe_eth_seg  eth;
-        struct mlx5_wqe_data_seg data[0];
+        union {
+                struct {
+                        struct mlx5_wqe_eth_seg  eth;
+                        struct mlx5_wqe_data_seg data[0];
+                };
+                u8 tls_progress_params_ctx[0];
+        };
 };
 
 struct mlx5e_rx_wqe_ll {
@@ -1100,6 +1105,8 @@ u32 mlx5e_ethtool_get_rxfh_key_size(struct mlx5e_priv *priv);
 u32 mlx5e_ethtool_get_rxfh_indir_size(struct mlx5e_priv *priv);
 int mlx5e_ethtool_get_ts_info(struct mlx5e_priv *priv,
                               struct ethtool_ts_info *info);
+int mlx5e_ethtool_flash_device(struct mlx5e_priv *priv,
+                               struct ethtool_flash *flash);
 void mlx5e_ethtool_get_pauseparam(struct mlx5e_priv *priv,
                                   struct ethtool_pauseparam *pauseparam);
 int mlx5e_ethtool_set_pauseparam(struct mlx5e_priv *priv,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
index f3d98748b211..c7f86453c638 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
@@ -76,26 +76,21 @@ static int mlx5e_tx_reporter_err_cqe_recover(struct mlx5e_txqsq *sq)
         u8 state;
         int err;
 
-        if (!test_bit(MLX5E_SQ_STATE_RECOVERING, &sq->state))
-                return 0;
-
         err = mlx5_core_query_sq_state(mdev, sq->sqn, &state);
         if (err) {
                 netdev_err(dev, "Failed to query SQ 0x%x state. err = %d\n",
                            sq->sqn, err);
-                return err;
+                goto out;
         }
 
-        if (state != MLX5_SQC_STATE_ERR) {
-                netdev_err(dev, "SQ 0x%x not in ERROR state\n", sq->sqn);
-                return -EINVAL;
-        }
+        if (state != MLX5_SQC_STATE_ERR)
+                goto out;
 
         mlx5e_tx_disable_queue(sq->txq);
 
         err = mlx5e_wait_for_sq_flush(sq);
         if (err)
-                return err;
+                goto out;
 
         /* At this point, no new packets will arrive from the stack as TXQ is
          * marked with QUEUE_STATE_DRV_XOFF. In addition, NAPI cleared all
@@ -104,13 +99,17 @@ static int mlx5e_tx_reporter_err_cqe_recover(struct mlx5e_txqsq *sq)
 
         err = mlx5e_sq_to_ready(sq, state);
         if (err)
-                return err;
+                goto out;
 
         mlx5e_reset_txqsq_cc_pc(sq);
         sq->stats->recover++;
+        clear_bit(MLX5E_SQ_STATE_RECOVERING, &sq->state);
         mlx5e_activate_txqsq(sq);
 
         return 0;
+out:
+        clear_bit(MLX5E_SQ_STATE_RECOVERING, &sq->state);
+        return err;
 }
 
 static int mlx5_tx_health_report(struct devlink_health_reporter *tx_reporter,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
index aaffa6f68dc0..7f78c004d12f 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
@@ -143,7 +143,10 @@ void mlx5e_activate_xsk(struct mlx5e_channel *c)
 {
         set_bit(MLX5E_RQ_STATE_ENABLED, &c->xskrq.state);
         /* TX queue is created active. */
+
+        spin_lock(&c->xskicosq_lock);
         mlx5e_trigger_irq(&c->xskicosq);
+        spin_unlock(&c->xskicosq_lock);
 }
 
 void mlx5e_deactivate_xsk(struct mlx5e_channel *c)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h
index 407da83474ef..b7298f9ee3d3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h
@@ -11,12 +11,14 @@
 #include "accel/tls.h"
 
 #define MLX5E_KTLS_STATIC_UMR_WQE_SZ \
-        (sizeof(struct mlx5e_umr_wqe) + MLX5_ST_SZ_BYTES(tls_static_params))
+        (offsetof(struct mlx5e_umr_wqe, tls_static_params_ctx) + \
+         MLX5_ST_SZ_BYTES(tls_static_params))
 #define MLX5E_KTLS_STATIC_WQEBBS \
         (DIV_ROUND_UP(MLX5E_KTLS_STATIC_UMR_WQE_SZ, MLX5_SEND_WQE_BB))
 
 #define MLX5E_KTLS_PROGRESS_WQE_SZ \
-        (sizeof(struct mlx5e_tx_wqe) + MLX5_ST_SZ_BYTES(tls_progress_params))
+        (offsetof(struct mlx5e_tx_wqe, tls_progress_params_ctx) + \
+         MLX5_ST_SZ_BYTES(tls_progress_params))
 #define MLX5E_KTLS_PROGRESS_WQEBBS \
         (DIV_ROUND_UP(MLX5E_KTLS_PROGRESS_WQE_SZ, MLX5_SEND_WQE_BB))
 #define MLX5E_KTLS_MAX_DUMP_WQEBBS 2
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
index 3766545ce259..7833ddef0427 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
@@ -69,7 +69,7 @@ build_static_params(struct mlx5e_umr_wqe *wqe, u16 pc, u32 sqn,
         cseg->qpn_ds           = cpu_to_be32((sqn << MLX5_WQE_CTRL_QPN_SHIFT) |
                                              STATIC_PARAMS_DS_CNT);
         cseg->fm_ce_se         = fence ? MLX5_FENCE_MODE_INITIATOR_SMALL : 0;
-        cseg->imm              = cpu_to_be32(priv_tx->tisn);
+        cseg->tisn             = cpu_to_be32(priv_tx->tisn << 8);
 
         ucseg->flags = MLX5_UMR_INLINE;
         ucseg->bsf_octowords = cpu_to_be16(MLX5_ST_SZ_BYTES(tls_static_params) / 16);
@@ -80,7 +80,7 @@ build_static_params(struct mlx5e_umr_wqe *wqe, u16 pc, u32 sqn,
 static void
 fill_progress_params_ctx(void *ctx, struct mlx5e_ktls_offload_context_tx *priv_tx)
 {
-        MLX5_SET(tls_progress_params, ctx, pd, priv_tx->tisn);
+        MLX5_SET(tls_progress_params, ctx, tisn, priv_tx->tisn);
         MLX5_SET(tls_progress_params, ctx, record_tracker_state,
                  MLX5E_TLS_PROGRESS_PARAMS_RECORD_TRACKER_STATE_START);
         MLX5_SET(tls_progress_params, ctx, auth_state,
@@ -104,18 +104,20 @@ build_progress_params(struct mlx5e_tx_wqe *wqe, u16 pc, u32 sqn,
                                              PROGRESS_PARAMS_DS_CNT);
         cseg->fm_ce_se         = fence ? MLX5_FENCE_MODE_INITIATOR_SMALL : 0;
 
-        fill_progress_params_ctx(wqe->data, priv_tx);
+        fill_progress_params_ctx(wqe->tls_progress_params_ctx, priv_tx);
 }
 
 static void tx_fill_wi(struct mlx5e_txqsq *sq,
                        u16 pi, u8 num_wqebbs,
-                       skb_frag_t *resync_dump_frag)
+                       skb_frag_t *resync_dump_frag,
+                       u32 num_bytes)
 {
         struct mlx5e_tx_wqe_info *wi = &sq->db.wqe_info[pi];
 
         wi->skb              = NULL;
         wi->num_wqebbs       = num_wqebbs;
         wi->resync_dump_frag = resync_dump_frag;
+        wi->num_bytes        = num_bytes;
 }
 
 void mlx5e_ktls_tx_offload_set_pending(struct mlx5e_ktls_offload_context_tx *priv_tx)
@@ -143,7 +145,7 @@ post_static_params(struct mlx5e_txqsq *sq,
 
         umr_wqe = mlx5e_sq_fetch_wqe(sq, MLX5E_KTLS_STATIC_UMR_WQE_SZ, &pi);
         build_static_params(umr_wqe, sq->pc, sq->sqn, priv_tx, fence);
-        tx_fill_wi(sq, pi, MLX5E_KTLS_STATIC_WQEBBS, NULL);
+        tx_fill_wi(sq, pi, MLX5E_KTLS_STATIC_WQEBBS, NULL, 0);
         sq->pc += MLX5E_KTLS_STATIC_WQEBBS;
 }
 
@@ -157,7 +159,7 @@ post_progress_params(struct mlx5e_txqsq *sq,
 
         wqe = mlx5e_sq_fetch_wqe(sq, MLX5E_KTLS_PROGRESS_WQE_SZ, &pi);
         build_progress_params(wqe, sq->pc, sq->sqn, priv_tx, fence);
-        tx_fill_wi(sq, pi, MLX5E_KTLS_PROGRESS_WQEBBS, NULL);
+        tx_fill_wi(sq, pi, MLX5E_KTLS_PROGRESS_WQEBBS, NULL, 0);
         sq->pc += MLX5E_KTLS_PROGRESS_WQEBBS;
 }
 
@@ -248,43 +250,37 @@ tx_post_resync_params(struct mlx5e_txqsq *sq,
         mlx5e_ktls_tx_post_param_wqes(sq, priv_tx, skip_static_post, true);
 }
 
+struct mlx5e_dump_wqe {
+        struct mlx5_wqe_ctrl_seg ctrl;
+        struct mlx5_wqe_data_seg data;
+};
+
 static int
 tx_post_resync_dump(struct mlx5e_txqsq *sq, struct sk_buff *skb,
                     skb_frag_t *frag, u32 tisn, bool first)
 {
         struct mlx5_wqe_ctrl_seg *cseg;
-        struct mlx5_wqe_eth_seg  *eseg;
         struct mlx5_wqe_data_seg *dseg;
-        struct mlx5e_tx_wqe *wqe;
+        struct mlx5e_dump_wqe *wqe;
         dma_addr_t dma_addr = 0;
-        u16 ds_cnt, ds_cnt_inl;
         u8  num_wqebbs;
-        u16 pi, ihs;
+        u16 ds_cnt;
         int fsz;
-
-        ds_cnt = sizeof(*wqe) / MLX5_SEND_WQE_DS;
-        ihs    = eth_get_headlen(skb->dev, skb->data, skb_headlen(skb));
-        ds_cnt_inl = DIV_ROUND_UP(ihs - INL_HDR_START_SZ, MLX5_SEND_WQE_DS);
-        ds_cnt += ds_cnt_inl;
-        ds_cnt += 1; /* one frag */
+        u16 pi;
 
         wqe = mlx5e_sq_fetch_wqe(sq, sizeof(*wqe), &pi);
 
+        ds_cnt = sizeof(*wqe) / MLX5_SEND_WQE_DS;
         num_wqebbs = DIV_ROUND_UP(ds_cnt, MLX5_SEND_WQEBB_NUM_DS);
 
         cseg = &wqe->ctrl;
-        eseg = &wqe->eth;
-        dseg =  wqe->data;
+        dseg = &wqe->data;
 
         cseg->opmod_idx_opcode = cpu_to_be32((sq->pc << 8)  | MLX5_OPCODE_DUMP);
         cseg->qpn_ds           = cpu_to_be32((sq->sqn << 8) | ds_cnt);
-        cseg->imm              = cpu_to_be32(tisn);
+        cseg->tisn             = cpu_to_be32(tisn << 8);
         cseg->fm_ce_se         = first ? MLX5_FENCE_MODE_INITIATOR_SMALL : 0;
 
-        eseg->inline_hdr.sz = cpu_to_be16(ihs);
-        memcpy(eseg->inline_hdr.start, skb->data, ihs);
-        dseg += ds_cnt_inl;
-
         fsz = skb_frag_size(frag);
         dma_addr = skb_frag_dma_map(sq->pdev, frag, 0, fsz,
                                     DMA_TO_DEVICE);
@@ -296,7 +292,7 @@ tx_post_resync_dump(struct mlx5e_txqsq *sq, struct sk_buff *skb,
         dseg->byte_count = cpu_to_be32(fsz);
         mlx5e_dma_push(sq, dma_addr, fsz, MLX5E_DMA_MAP_PAGE);
 
-        tx_fill_wi(sq, pi, num_wqebbs, frag);
+        tx_fill_wi(sq, pi, num_wqebbs, frag, fsz);
         sq->pc += num_wqebbs;
 
         WARN(num_wqebbs > MLX5E_KTLS_MAX_DUMP_WQEBBS,
@@ -323,7 +319,7 @@ static void tx_post_fence_nop(struct mlx5e_txqsq *sq)
         struct mlx5_wq_cyc *wq = &sq->wq;
         u16 pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);
 
-        tx_fill_wi(sq, pi, 1, NULL);
+        tx_fill_wi(sq, pi, 1, NULL, 0);
 
         mlx5e_post_nop_fence(wq, sq->sqn, &sq->pc);
 }
@@ -434,7 +430,7 @@ struct sk_buff *mlx5e_ktls_handle_tx_skb(struct net_device *netdev,
         priv_tx->expected_seq = seq + datalen;
 
         cseg = &(*wqe)->ctrl;
-        cseg->imm = cpu_to_be32(priv_tx->tisn);
+        cseg->tisn = cpu_to_be32(priv_tx->tisn << 8);
 
         stats->tls_encrypted_packets += skb_is_gso(skb) ? skb_shinfo(skb)->gso_segs : 1;
         stats->tls_encrypted_bytes   += datalen;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c
index 8657e0f26995..2c75b2752f58 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c
@@ -437,12 +437,6 @@ arfs_hash_bucket(struct arfs_table *arfs_t, __be16 src_port,
         return &arfs_t->rules_hash[bucket_idx];
 }
 
-static u8 arfs_get_ip_proto(const struct sk_buff *skb)
-{
-        return (skb->protocol == htons(ETH_P_IP)) ?
-                ip_hdr(skb)->protocol : ipv6_hdr(skb)->nexthdr;
-}
-
 static struct arfs_table *arfs_get_table(struct mlx5e_arfs_tables *arfs,
                                          u8 ip_proto, __be16 etype)
 {
@@ -602,31 +596,9 @@ out:
         arfs_may_expire_flow(priv);
 }
 
-/* return L4 destination port from ip4/6 packets */
-static __be16 arfs_get_dst_port(const struct sk_buff *skb)
-{
-        char *transport_header;
-
-        transport_header = skb_transport_header(skb);
-        if (arfs_get_ip_proto(skb) == IPPROTO_TCP)
-                return ((struct tcphdr *)transport_header)->dest;
-        return ((struct udphdr *)transport_header)->dest;
-}
-
-/* return L4 source port from ip4/6 packets */
-static __be16 arfs_get_src_port(const struct sk_buff *skb)
-{
-        char *transport_header;
-
-        transport_header = skb_transport_header(skb);
-        if (arfs_get_ip_proto(skb) == IPPROTO_TCP)
-                return ((struct tcphdr *)transport_header)->source;
-        return ((struct udphdr *)transport_header)->source;
-}
-
 static struct arfs_rule *arfs_alloc_rule(struct mlx5e_priv *priv,
                                          struct arfs_table *arfs_t,
-                                         const struct sk_buff *skb,
+                                         const struct flow_keys *fk,
                                          u16 rxq, u32 flow_id)
 {
         struct arfs_rule *rule;
@@ -641,19 +613,19 @@ static struct arfs_rule *arfs_alloc_rule(struct mlx5e_priv *priv,
         INIT_WORK(&rule->arfs_work, arfs_handle_work);
 
         tuple = &rule->tuple;
-        tuple->etype = skb->protocol;
+        tuple->etype = fk->basic.n_proto;
+        tuple->ip_proto = fk->basic.ip_proto;
         if (tuple->etype == htons(ETH_P_IP)) {
-                tuple->src_ipv4 = ip_hdr(skb)->saddr;
-                tuple->dst_ipv4 = ip_hdr(skb)->daddr;
+                tuple->src_ipv4 = fk->addrs.v4addrs.src;
+                tuple->dst_ipv4 = fk->addrs.v4addrs.dst;
         } else {
-                memcpy(&tuple->src_ipv6, &ipv6_hdr(skb)->saddr,
+                memcpy(&tuple->src_ipv6, &fk->addrs.v6addrs.src,
                        sizeof(struct in6_addr));
-                memcpy(&tuple->dst_ipv6, &ipv6_hdr(skb)->daddr,
+                memcpy(&tuple->dst_ipv6, &fk->addrs.v6addrs.dst,
                        sizeof(struct in6_addr));
         }
-        tuple->ip_proto = arfs_get_ip_proto(skb);
-        tuple->src_port = arfs_get_src_port(skb);
-        tuple->dst_port = arfs_get_dst_port(skb);
+        tuple->src_port = fk->ports.src;
+        tuple->dst_port = fk->ports.dst;
 
         rule->flow_id = flow_id;
         rule->filter_id = priv->fs.arfs.last_filter_id++ % RPS_NO_FILTER;
@@ -664,37 +636,33 @@ static struct arfs_rule *arfs_alloc_rule(struct mlx5e_priv *priv,
         return rule;
 }
 
-static bool arfs_cmp_ips(struct arfs_tuple *tuple,
-                         const struct sk_buff *skb)
+static bool arfs_cmp(const struct arfs_tuple *tuple, const struct flow_keys *fk)
 {
-        if (tuple->etype == htons(ETH_P_IP) &&
-            tuple->src_ipv4 == ip_hdr(skb)->saddr &&
-            tuple->dst_ipv4 == ip_hdr(skb)->daddr)
-                return true;
-        if (tuple->etype == htons(ETH_P_IPV6) &&
-            (!memcmp(&tuple->src_ipv6, &ipv6_hdr(skb)->saddr,
-                     sizeof(struct in6_addr))) &&
-            (!memcmp(&tuple->dst_ipv6, &ipv6_hdr(skb)->daddr,
-                     sizeof(struct in6_addr))))
-                return true;
+        if (tuple->src_port != fk->ports.src || tuple->dst_port != fk->ports.dst)
+                return false;
+        if (tuple->etype != fk->basic.n_proto)
+                return false;
+        if (tuple->etype == htons(ETH_P_IP))
+                return tuple->src_ipv4 == fk->addrs.v4addrs.src &&
+                       tuple->dst_ipv4 == fk->addrs.v4addrs.dst;
+        if (tuple->etype == htons(ETH_P_IPV6))
+                return !memcmp(&tuple->src_ipv6, &fk->addrs.v6addrs.src,
+                               sizeof(struct in6_addr)) &&
+                       !memcmp(&tuple->dst_ipv6, &fk->addrs.v6addrs.dst,
+                               sizeof(struct in6_addr));
         return false;
 }
 
 static struct arfs_rule *arfs_find_rule(struct arfs_table *arfs_t,
-                                        const struct sk_buff *skb)
+                                        const struct flow_keys *fk)
 {
         struct arfs_rule *arfs_rule;
         struct hlist_head *head;
-        __be16 src_port = arfs_get_src_port(skb);
-        __be16 dst_port = arfs_get_dst_port(skb);
 
-        head = arfs_hash_bucket(arfs_t, src_port, dst_port);
+        head = arfs_hash_bucket(arfs_t, fk->ports.src, fk->ports.dst);
         hlist_for_each_entry(arfs_rule, head, hlist) {
-                if (arfs_rule->tuple.src_port == src_port &&
-                    arfs_rule->tuple.dst_port == dst_port &&
-                    arfs_cmp_ips(&arfs_rule->tuple, skb)) {
+                if (arfs_cmp(&arfs_rule->tuple, fk))
                         return arfs_rule;
-                }
         }
 
         return NULL;
@@ -707,20 +675,24 @@ int mlx5e_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
         struct mlx5e_arfs_tables *arfs = &priv->fs.arfs;
         struct arfs_table *arfs_t;
         struct arfs_rule *arfs_rule;
+        struct flow_keys fk;
+
+        if (!skb_flow_dissect_flow_keys(skb, &fk, 0))
+                return -EPROTONOSUPPORT;
 
-        if (skb->protocol != htons(ETH_P_IP) &&
-            skb->protocol != htons(ETH_P_IPV6))
+        if (fk.basic.n_proto != htons(ETH_P_IP) &&
+            fk.basic.n_proto != htons(ETH_P_IPV6))
                 return -EPROTONOSUPPORT;
 
         if (skb->encapsulation)
                 return -EPROTONOSUPPORT;
 
-        arfs_t = arfs_get_table(arfs, arfs_get_ip_proto(skb), skb->protocol);
+        arfs_t = arfs_get_table(arfs, fk.basic.ip_proto, fk.basic.n_proto);
         if (!arfs_t)
                 return -EPROTONOSUPPORT;
 
         spin_lock_bh(&arfs->arfs_lock);
-        arfs_rule = arfs_find_rule(arfs_t, skb);
+        arfs_rule = arfs_find_rule(arfs_t, &fk);
         if (arfs_rule) {
                 if (arfs_rule->rxq == rxq_index) {
                         spin_unlock_bh(&arfs->arfs_lock);
@@ -728,8 +700,7 @@ int mlx5e_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
                 }
                 arfs_rule->rxq = rxq_index;
         } else {
-                arfs_rule = arfs_alloc_rule(priv, arfs_t, skb,
-                                            rxq_index, flow_id);
+                arfs_rule = arfs_alloc_rule(priv, arfs_t, &fk, rxq_index, flow_id);
                 if (!arfs_rule) {
                         spin_unlock_bh(&arfs->arfs_lock);
                         return -ENOMEM;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index 03bed714bac3..20e628c907e5 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -1081,6 +1081,14 @@ int mlx5e_ethtool_set_link_ksettings(struct mlx5e_priv *priv,
         link_modes = autoneg == AUTONEG_ENABLE ? ethtool2ptys_adver_func(adver) :
                 mlx5e_port_speed2linkmodes(mdev, speed, !ext);
 
+        if ((link_modes & MLX5E_PROT_MASK(MLX5E_56GBASE_R4)) &&
+            autoneg != AUTONEG_ENABLE) {
+                netdev_err(priv->netdev, "%s: 56G link speed requires autoneg enabled\n",
+                           __func__);
+                err = -EINVAL;
+                goto out;
+        }
+
         link_modes = link_modes & eproto.cap;
         if (!link_modes) {
                 netdev_err(priv->netdev, "%s: Not supported link mode(s) requested",
@@ -1338,6 +1346,9 @@ int mlx5e_ethtool_set_pauseparam(struct mlx5e_priv *priv,
         struct mlx5_core_dev *mdev = priv->mdev;
         int err;
 
+        if (!MLX5_CAP_GEN(mdev, vport_group_manager))
+                return -EOPNOTSUPP;
+
         if (pauseparam->autoneg)
                 return -EINVAL;
 
@@ -1679,6 +1690,40 @@ static int mlx5e_get_module_eeprom(struct net_device *netdev,
         return 0;
 }
 
+int mlx5e_ethtool_flash_device(struct mlx5e_priv *priv,
+                               struct ethtool_flash *flash)
+{
+        struct mlx5_core_dev *mdev = priv->mdev;
+        struct net_device *dev = priv->netdev;
+        const struct firmware *fw;
+        int err;
+
+        if (flash->region != ETHTOOL_FLASH_ALL_REGIONS)
+                return -EOPNOTSUPP;
+
+        err = request_firmware_direct(&fw, flash->data, &dev->dev);
+        if (err)
+                return err;
+
+        dev_hold(dev);
+        rtnl_unlock();
+
+        err = mlx5_firmware_flash(mdev, fw, NULL);
+        release_firmware(fw);
+
+        rtnl_lock();
+        dev_put(dev);
+        return err;
+}
+
+static int mlx5e_flash_device(struct net_device *dev,
+                              struct ethtool_flash *flash)
+{
+        struct mlx5e_priv *priv = netdev_priv(dev);
+
+        return mlx5e_ethtool_flash_device(priv, flash);
+}
+
 static int set_pflag_cqe_based_moder(struct net_device *netdev, bool enable,
                                      bool is_rx_cq)
 {
@@ -1961,6 +2006,7 @@ const struct ethtool_ops mlx5e_ethtool_ops = {
         .set_wol           = mlx5e_set_wol,
         .get_module_info   = mlx5e_get_module_info,
         .get_module_eeprom = mlx5e_get_module_eeprom,
+        .flash_device      = mlx5e_flash_device,
         .get_priv_flags    = mlx5e_get_priv_flags,
         .set_priv_flags    = mlx5e_set_priv_flags,
         .self_test         = mlx5e_self_test,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 6c712c5be4d8..9d5f6e56188f 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -1321,7 +1321,6 @@ err_free_txqsq:
 void mlx5e_activate_txqsq(struct mlx5e_txqsq *sq)
 {
         sq->txq = netdev_get_tx_queue(sq->channel->netdev, sq->txq_ix);
-        clear_bit(MLX5E_SQ_STATE_RECOVERING, &sq->state);
         set_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);
         netdev_tx_reset_queue(sq->txq);
         netif_tx_start_queue(sq->txq);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 7ecfc53cf5f6..00b2d4a86159 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -1480,7 +1480,7 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,
                               struct mlx5_flow_spec *spec,
                               struct flow_cls_offload *f,
                               struct net_device *filter_dev,
-                              u8 *match_level, u8 *tunnel_match_level)
+                              u8 *inner_match_level, u8 *outer_match_level)
 {
         struct netlink_ext_ack *extack = f->common.extack;
         void *headers_c = MLX5_ADDR_OF(fte_match_param, spec->match_criteria,
@@ -1495,8 +1495,9 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,
         struct flow_dissector *dissector = rule->match.dissector;
         u16 addr_type = 0;
         u8 ip_proto = 0;
+        u8 *match_level;
 
-        *match_level = MLX5_MATCH_NONE;
+        match_level = outer_match_level;
 
         if (dissector->used_keys &
             ~(BIT(FLOW_DISSECTOR_KEY_META) |
@@ -1524,12 +1525,14 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,
         }
 
         if (mlx5e_get_tc_tun(filter_dev)) {
-                if (parse_tunnel_attr(priv, spec, f, filter_dev, tunnel_match_level))
+                if (parse_tunnel_attr(priv, spec, f, filter_dev,
+                                      outer_match_level))
                         return -EOPNOTSUPP;
 
-                /* In decap flow, header pointers should point to the inner
+                /* At this point, header pointers should point to the inner
                  * headers, outer header were already set by parse_tunnel_attr
                  */
+                match_level = inner_match_level;
                 headers_c = get_match_headers_criteria(MLX5_FLOW_CONTEXT_ACTION_DECAP,
                                                        spec);
                 headers_v = get_match_headers_value(MLX5_FLOW_CONTEXT_ACTION_DECAP,
@@ -1831,35 +1834,41 @@ static int parse_cls_flower(struct mlx5e_priv *priv,
                             struct flow_cls_offload *f,
                             struct net_device *filter_dev)
 {
+        u8 inner_match_level, outer_match_level, non_tunnel_match_level;
         struct netlink_ext_ack *extack = f->common.extack;
         struct mlx5_core_dev *dev = priv->mdev;
         struct mlx5_eswitch *esw = dev->priv.eswitch;
         struct mlx5e_rep_priv *rpriv = priv->ppriv;
-        u8 match_level, tunnel_match_level = MLX5_MATCH_NONE;
         struct mlx5_eswitch_rep *rep;
         int err;
 
-        err = __parse_cls_flower(priv, spec, f, filter_dev, &match_level, &tunnel_match_level);
+        inner_match_level = MLX5_MATCH_NONE;
+        outer_match_level = MLX5_MATCH_NONE;
+
+        err = __parse_cls_flower(priv, spec, f, filter_dev, &inner_match_level,
+                                 &outer_match_level);
+        non_tunnel_match_level = (inner_match_level == MLX5_MATCH_NONE) ?
+                                 outer_match_level : inner_match_level;
 
         if (!err && (flow->flags & MLX5E_TC_FLOW_ESWITCH)) {
                 rep = rpriv->rep;
                 if (rep->vport != MLX5_VPORT_UPLINK &&
                     (esw->offloads.inline_mode != MLX5_INLINE_MODE_NONE &&
-                    esw->offloads.inline_mode < match_level)) {
+                    esw->offloads.inline_mode < non_tunnel_match_level)) {
                         NL_SET_ERR_MSG_MOD(extack,
                                            "Flow is not offloaded due to min inline setting");
                         netdev_warn(priv->netdev,
                                     "Flow is not offloaded due to min inline setting, required %d actual %d\n",
-                                    match_level, esw->offloads.inline_mode);
+                                    non_tunnel_match_level, esw->offloads.inline_mode);
                         return -EOPNOTSUPP;
                 }
         }
 
         if (flow->flags & MLX5E_TC_FLOW_ESWITCH) {
-                flow->esw_attr->match_level = match_level;
-                flow->esw_attr->tunnel_match_level = tunnel_match_level;
+                flow->esw_attr->inner_match_level = inner_match_level;
+                flow->esw_attr->outer_match_level = outer_match_level;
         } else {
-                flow->nic_attr->match_level = match_level;
+                flow->nic_attr->match_level = non_tunnel_match_level;
         }
 
         return err;
@@ -3158,7 +3167,7 @@ mlx5e_flow_esw_attr_init(struct mlx5_esw_flow_attr *esw_attr,
 
         esw_attr->parse_attr = parse_attr;
         esw_attr->chain = f->common.chain_index;
-        esw_attr->prio = TC_H_MAJ(f->common.prio) >> 16;
+        esw_attr->prio = f->common.prio;
 
         esw_attr->in_rep = in_rep;
         esw_attr->in_mdev = in_mdev;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index a38e8a3c7c9a..04685dbb280c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -377,8 +377,8 @@ struct mlx5_esw_flow_attr {
                 struct mlx5_termtbl_handle *termtbl;
         } dests[MLX5_MAX_FLOW_FWD_VPORTS];
         u32     mod_hdr_id;
-        u8      match_level;
-        u8      tunnel_match_level;
+        u8      inner_match_level;
+        u8      outer_match_level;
         struct mlx5_fc *counter;
         u32     chain;
         u16     prio;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 089ae4d48a82..0323fd078271 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -207,14 +207,10 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw,
 
         mlx5_eswitch_set_rule_source_port(esw, spec, attr);
 
-        if (flow_act.action & MLX5_FLOW_CONTEXT_ACTION_DECAP) {
-                if (attr->tunnel_match_level != MLX5_MATCH_NONE)
-                        spec->match_criteria_enable |= MLX5_MATCH_OUTER_HEADERS;
-                if (attr->match_level != MLX5_MATCH_NONE)
-                        spec->match_criteria_enable |= MLX5_MATCH_INNER_HEADERS;
-        } else if (attr->match_level != MLX5_MATCH_NONE) {
+        if (attr->outer_match_level != MLX5_MATCH_NONE)
                 spec->match_criteria_enable |= MLX5_MATCH_OUTER_HEADERS;
-        }
+        if (attr->inner_match_level != MLX5_MATCH_NONE)
+                spec->match_criteria_enable |= MLX5_MATCH_INNER_HEADERS;
 
         if (flow_act.action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)
                 flow_act.modify_id = attr->mod_hdr_id;
@@ -290,7 +286,7 @@ mlx5_eswitch_add_fwd_rule(struct mlx5_eswitch *esw,
         mlx5_eswitch_set_rule_source_port(esw, spec, attr);
 
         spec->match_criteria_enable |= MLX5_MATCH_MISC_PARAMETERS;
-        if (attr->match_level != MLX5_MATCH_NONE)
+        if (attr->outer_match_level != MLX5_MATCH_NONE)
                 spec->match_criteria_enable |= MLX5_MATCH_OUTER_HEADERS;
 
         rule = mlx5_add_flow_rules(fast_fdb, spec, &flow_act, dest, i);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c
index 9314777d99e3..d685122d9ff7 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/health.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c
@@ -590,7 +590,8 @@ mlx5_fw_fatal_reporter_dump(struct devlink_health_reporter *reporter,
                         data_size = crdump_size - offset;
                 else
                         data_size = MLX5_CR_DUMP_CHUNK_SIZE;
-                err = devlink_fmsg_binary_put(fmsg, cr_data, data_size);
+                err = devlink_fmsg_binary_put(fmsg, (char *)cr_data + offset,
+                                              data_size);
                 if (err)
                         goto free_data;
         }
@@ -700,6 +701,16 @@ static void poll_health(struct timer_list *t)
         if (dev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR)
                 goto out;
 
+        fatal_error = check_fatal_sensors(dev);
+
+        if (fatal_error && !health->fatal_error) {
+                mlx5_core_err(dev, "Fatal error %u detected\n", fatal_error);
+                dev->priv.health.fatal_error = fatal_error;
+                print_health_info(dev);
+                mlx5_trigger_health_work(dev);
+                goto out;
+        }
+
         count = ioread32be(health->health_counter);
         if (count == health->prev)
                 ++health->miss_counter;
@@ -718,15 +729,6 @@ static void poll_health(struct timer_list *t)
         if (health->synd && health->synd != prev_synd)
                 queue_work(health->wq, &health->report_work);
 
-        fatal_error = check_fatal_sensors(dev);
-
-        if (fatal_error && !health->fatal_error) {
-                mlx5_core_err(dev, "Fatal error %u detected\n", fatal_error);
-                dev->priv.health.fatal_error = fatal_error;
-                print_health_info(dev);
-                mlx5_trigger_health_work(dev);
-        }
-
 out:
         mod_timer(&health->timer, get_next_poll_jiffies());
 }
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
index ebd81f6b556e..90cb50fe17fd 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
@@ -122,6 +122,14 @@ static int mlx5i_get_ts_info(struct net_device *netdev,
         return mlx5e_ethtool_get_ts_info(priv, info);
 }
 
+static int mlx5i_flash_device(struct net_device *netdev,
+                              struct ethtool_flash *flash)
+{
+        struct mlx5e_priv *priv = mlx5i_epriv(netdev);
+
+        return mlx5e_ethtool_flash_device(priv, flash);
+}
+
 enum mlx5_ptys_width {
         MLX5_PTYS_WIDTH_1X      = 1 << 0,
         MLX5_PTYS_WIDTH_2X      = 1 << 1,
@@ -233,6 +241,7 @@ const struct ethtool_ops mlx5i_ethtool_ops = {
         .get_ethtool_stats  = mlx5i_get_ethtool_stats,
         .get_ringparam      = mlx5i_get_ringparam,
         .set_ringparam      = mlx5i_set_ringparam,
+        .flash_device       = mlx5i_flash_device,
         .get_channels       = mlx5i_get_channels,
         .set_channels       = mlx5i_set_channels,
         .get_coalesce       = mlx5i_get_coalesce,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c
index ea9ee88491e5..ea1d4d26ece0 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c
@@ -27,6 +27,7 @@ int mlx5_create_encryption_key(struct mlx5_core_dev *mdev,
         case 128:
                 general_obj_key_size =
                         MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_KEY_SIZE_128;
+                key_p += sz_bytes;
                 break;
         case 256:
                 general_obj_key_size =
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
index e8ac90564dbe..84a87d059333 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
@@ -471,7 +471,7 @@ int mlxsw_sp_acl_rulei_commit(struct mlxsw_sp_acl_rule_info *rulei)
 void mlxsw_sp_acl_rulei_priority(struct mlxsw_sp_acl_rule_info *rulei,
                                  unsigned int priority)
 {
-        rulei->priority = priority >> 16;
+        rulei->priority = priority;
 }
 
 void mlxsw_sp_acl_rulei_keymask_u32(struct mlxsw_sp_acl_rule_info *rulei,
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
index 63b07edd9d81..38bb1cfe4e8c 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
@@ -29,7 +29,7 @@
 
 struct mlxsw_sp_ptp_state {
         struct mlxsw_sp *mlxsw_sp;
-        struct rhashtable unmatched_ht;
+        struct rhltable unmatched_ht;
         spinlock_t unmatched_lock; /* protects the HT */
         struct delayed_work ht_gc_dw;
         u32 gc_cycle;
@@ -45,7 +45,7 @@ struct mlxsw_sp1_ptp_key {
 
 struct mlxsw_sp1_ptp_unmatched {
         struct mlxsw_sp1_ptp_key key;
-        struct rhash_head ht_node;
+        struct rhlist_head ht_node;
         struct rcu_head rcu;
         struct sk_buff *skb;
         u64 timestamp;
@@ -359,7 +359,7 @@ static int mlxsw_sp_ptp_parse(struct sk_buff *skb,
 /* Returns NULL on successful insertion, a pointer on conflict, or an ERR_PTR on
  * error.
  */
-static struct mlxsw_sp1_ptp_unmatched *
+static int
 mlxsw_sp1_ptp_unmatched_save(struct mlxsw_sp *mlxsw_sp,
                              struct mlxsw_sp1_ptp_key key,
                              struct sk_buff *skb,
@@ -368,41 +368,51 @@ mlxsw_sp1_ptp_unmatched_save(struct mlxsw_sp *mlxsw_sp,
         int cycles = MLXSW_SP1_PTP_HT_GC_TIMEOUT / MLXSW_SP1_PTP_HT_GC_INTERVAL;
         struct mlxsw_sp_ptp_state *ptp_state = mlxsw_sp->ptp_state;
         struct mlxsw_sp1_ptp_unmatched *unmatched;
-        struct mlxsw_sp1_ptp_unmatched *conflict;
+        int err;
 
         unmatched = kzalloc(sizeof(*unmatched), GFP_ATOMIC);
         if (!unmatched)
-                return ERR_PTR(-ENOMEM);
+                return -ENOMEM;
 
         unmatched->key = key;
         unmatched->skb = skb;
         unmatched->timestamp = timestamp;
         unmatched->gc_cycle = mlxsw_sp->ptp_state->gc_cycle + cycles;
 
-        conflict = rhashtable_lookup_get_insert_fast(&ptp_state->unmatched_ht,
-                                            &unmatched->ht_node,
-                                            mlxsw_sp1_ptp_unmatched_ht_params);
-        if (conflict)
+        err = rhltable_insert(&ptp_state->unmatched_ht, &unmatched->ht_node,
+                              mlxsw_sp1_ptp_unmatched_ht_params);
+        if (err)
                 kfree(unmatched);
 
-        return conflict;
+        return err;
 }
 
 static struct mlxsw_sp1_ptp_unmatched *
 mlxsw_sp1_ptp_unmatched_lookup(struct mlxsw_sp *mlxsw_sp,
-                               struct mlxsw_sp1_ptp_key key)
+                               struct mlxsw_sp1_ptp_key key, int *p_length)
 {
-        return rhashtable_lookup(&mlxsw_sp->ptp_state->unmatched_ht, &key,
-                                 mlxsw_sp1_ptp_unmatched_ht_params);
+        struct mlxsw_sp1_ptp_unmatched *unmatched, *last = NULL;
+        struct rhlist_head *tmp, *list;
+        int length = 0;
+
+        list = rhltable_lookup(&mlxsw_sp->ptp_state->unmatched_ht, &key,
+                               mlxsw_sp1_ptp_unmatched_ht_params);
+        rhl_for_each_entry_rcu(unmatched, tmp, list, ht_node) {
+                last = unmatched;
+                length++;
+        }
+
+        *p_length = length;
+        return last;
 }
 
 static int
 mlxsw_sp1_ptp_unmatched_remove(struct mlxsw_sp *mlxsw_sp,
                                struct mlxsw_sp1_ptp_unmatched *unmatched)
 {
-        return rhashtable_remove_fast(&mlxsw_sp->ptp_state->unmatched_ht,
-                                      &unmatched->ht_node,
-                                      mlxsw_sp1_ptp_unmatched_ht_params);
+        return rhltable_remove(&mlxsw_sp->ptp_state->unmatched_ht,
+                               &unmatched->ht_node,
+                               mlxsw_sp1_ptp_unmatched_ht_params);
 }
 
 /* This function is called in the following scenarios:
@@ -489,75 +499,38 @@ static void mlxsw_sp1_ptp_got_piece(struct mlxsw_sp *mlxsw_sp,
                                     struct mlxsw_sp1_ptp_key key,
                                     struct sk_buff *skb, u64 timestamp)
 {
-        struct mlxsw_sp1_ptp_unmatched *unmatched, *conflict;
+        struct mlxsw_sp1_ptp_unmatched *unmatched;
+        int length;
         int err;
 
         rcu_read_lock();
 
-        unmatched = mlxsw_sp1_ptp_unmatched_lookup(mlxsw_sp, key);
-
         spin_lock(&mlxsw_sp->ptp_state->unmatched_lock);
 
-        if (unmatched) {
-                /* There was an unmatched entry when we looked, but it may have
-                 * been removed before we took the lock.
-                 */
-                err = mlxsw_sp1_ptp_unmatched_remove(mlxsw_sp, unmatched);
-                if (err)
-                        unmatched = NULL;
-        }
-
-        if (!unmatched) {
-                /* We have no unmatched entry, but one may have been added after
-                 * we looked, but before we took the lock.
-                 */
-                unmatched = mlxsw_sp1_ptp_unmatched_save(mlxsw_sp, key,
-                                                         skb, timestamp);
-                if (IS_ERR(unmatched)) {
-                        if (skb)
-                                mlxsw_sp1_ptp_packet_finish(mlxsw_sp, skb,
-                                                            key.local_port,
-                                                            key.ingress, NULL);
-                        unmatched = NULL;
-                } else if (unmatched) {
-                        /* Save just told us, under lock, that the entry is
-                         * there, so this has to work.
-                         */
-                        err = mlxsw_sp1_ptp_unmatched_remove(mlxsw_sp,
-                                                             unmatched);
-                        WARN_ON_ONCE(err);
-                }
-        }
-
-        /* If unmatched is non-NULL here, it comes either from the lookup, or
-         * from the save attempt above. In either case the entry was removed
-         * from the hash table. If unmatched is NULL, a new unmatched entry was
-         * added to the hash table, and there was no conflict.
-         */
-
+        unmatched = mlxsw_sp1_ptp_unmatched_lookup(mlxsw_sp, key, &length);
         if (skb && unmatched && unmatched->timestamp) {
                 unmatched->skb = skb;
         } else if (timestamp && unmatched && unmatched->skb) {
                 unmatched->timestamp = timestamp;
-        } else if (unmatched) {
-                /* unmatched holds an older entry of the same type: either an
-                 * skb if we are handling skb, or a timestamp if we are handling
-                 * timestamp. We can't match that up, so save what we have.
+        } else {
+                /* Either there is no entry to match, or one that is there is
+                 * incompatible.
                  */
-                conflict = mlxsw_sp1_ptp_unmatched_save(mlxsw_sp, key,
-                                                        skb, timestamp);
-                if (IS_ERR(conflict)) {
-                        if (skb)
-                                mlxsw_sp1_ptp_packet_finish(mlxsw_sp, skb,
-                                                            key.local_port,
-                                                            key.ingress, NULL);
-                } else {
-                        /* Above, we removed an object with this key from the
-                         * hash table, under lock, so conflict can not be a
-                         * valid pointer.
-                         */
-                        WARN_ON_ONCE(conflict);
-                }
+                if (length < 100)
+                        err = mlxsw_sp1_ptp_unmatched_save(mlxsw_sp, key,
+                                                           skb, timestamp);
+                else
+                        err = -E2BIG;
+                if (err && skb)
+                        mlxsw_sp1_ptp_packet_finish(mlxsw_sp, skb,
+                                                    key.local_port,
+                                                    key.ingress, NULL);
+                unmatched = NULL;
+        }
+
+        if (unmatched) {
+                err = mlxsw_sp1_ptp_unmatched_remove(mlxsw_sp, unmatched);
+                WARN_ON_ONCE(err);
         }
 
         spin_unlock(&mlxsw_sp->ptp_state->unmatched_lock);
@@ -669,9 +642,8 @@ mlxsw_sp1_ptp_ht_gc_collect(struct mlxsw_sp_ptp_state *ptp_state,
         local_bh_disable();
 
         spin_lock(&ptp_state->unmatched_lock);
-        err = rhashtable_remove_fast(&ptp_state->unmatched_ht,
-                                     &unmatched->ht_node,
-                                     mlxsw_sp1_ptp_unmatched_ht_params);
+        err = rhltable_remove(&ptp_state->unmatched_ht, &unmatched->ht_node,
+                              mlxsw_sp1_ptp_unmatched_ht_params);
         spin_unlock(&ptp_state->unmatched_lock);
 
         if (err)
@@ -702,7 +674,7 @@ static void mlxsw_sp1_ptp_ht_gc(struct work_struct *work)
         ptp_state = container_of(dwork, struct mlxsw_sp_ptp_state, ht_gc_dw);
         gc_cycle = ptp_state->gc_cycle++;
 
-        rhashtable_walk_enter(&ptp_state->unmatched_ht, &iter);
+        rhltable_walk_enter(&ptp_state->unmatched_ht, &iter);
         rhashtable_walk_start(&iter);
         while ((obj = rhashtable_walk_next(&iter))) {
                 if (IS_ERR(obj))
@@ -855,8 +827,8 @@ struct mlxsw_sp_ptp_state *mlxsw_sp1_ptp_init(struct mlxsw_sp *mlxsw_sp)
 
         spin_lock_init(&ptp_state->unmatched_lock);
 
-        err = rhashtable_init(&ptp_state->unmatched_ht,
-                              &mlxsw_sp1_ptp_unmatched_ht_params);
+        err = rhltable_init(&ptp_state->unmatched_ht,
+                            &mlxsw_sp1_ptp_unmatched_ht_params);
         if (err)
                 goto err_hashtable_init;
 
@@ -891,7 +863,7 @@ err_fifo_clr:
 err_mtptpt1_set:
         mlxsw_sp_ptp_mtptpt_set(mlxsw_sp, MLXSW_REG_MTPTPT_TRAP_ID_PTP0, 0);
 err_mtptpt_set:
-        rhashtable_destroy(&ptp_state->unmatched_ht);
+        rhltable_destroy(&ptp_state->unmatched_ht);
 err_hashtable_init:
         kfree(ptp_state);
         return ERR_PTR(err);
@@ -906,8 +878,8 @@ void mlxsw_sp1_ptp_fini(struct mlxsw_sp_ptp_state *ptp_state)
         mlxsw_sp1_ptp_set_fifo_clr_on_trap(mlxsw_sp, false);
         mlxsw_sp_ptp_mtptpt_set(mlxsw_sp, MLXSW_REG_MTPTPT_TRAP_ID_PTP1, 0);
         mlxsw_sp_ptp_mtptpt_set(mlxsw_sp, MLXSW_REG_MTPTPT_TRAP_ID_PTP0, 0);
-        rhashtable_free_and_destroy(&ptp_state->unmatched_ht,
-                                    &mlxsw_sp1_ptp_unmatched_free_fn, NULL);
+        rhltable_free_and_destroy(&ptp_state->unmatched_ht,
+                                  &mlxsw_sp1_ptp_unmatched_free_fn, NULL);
         kfree(ptp_state);
 }
 
diff --git a/drivers/net/ethernet/mscc/ocelot_ace.c b/drivers/net/ethernet/mscc/ocelot_ace.c
index 39aca1ab4687..86fc6e6b46dd 100644
--- a/drivers/net/ethernet/mscc/ocelot_ace.c
+++ b/drivers/net/ethernet/mscc/ocelot_ace.c
@@ -317,7 +317,7 @@ static void is2_action_set(struct vcap_data *data,
                 break;
         case OCELOT_ACL_ACTION_TRAP:
                 VCAP_ACT_SET(PORT_MASK, 0x0);
-                VCAP_ACT_SET(MASK_MODE, 0x0);
+                VCAP_ACT_SET(MASK_MODE, 0x1);
                 VCAP_ACT_SET(POLICE_ENA, 0x0);
                 VCAP_ACT_SET(POLICE_IDX, 0x0);
                 VCAP_ACT_SET(CPU_QU_NUM, 0x0);
diff --git a/drivers/net/ethernet/mscc/ocelot_flower.c b/drivers/net/ethernet/mscc/ocelot_flower.c
index 59487d446a09..b894bc0c9c16 100644
--- a/drivers/net/ethernet/mscc/ocelot_flower.c
+++ b/drivers/net/ethernet/mscc/ocelot_flower.c
@@ -13,12 +13,6 @@ struct ocelot_port_block {
         struct ocelot_port *port;
 };
 
-static u16 get_prio(u32 prio)
-{
-        /* prio starts from 0x1000 while the ids starts from 0 */
-        return prio >> 16;
-}
-
 static int ocelot_flower_parse_action(struct flow_cls_offload *f,
                                       struct ocelot_ace_rule *rule)
 {
@@ -168,7 +162,7 @@ static int ocelot_flower_parse(struct flow_cls_offload *f,
         }
 
 finished_key_parsing:
-        ocelot_rule->prio = get_prio(f->common.prio);
+        ocelot_rule->prio = f->common.prio;
         ocelot_rule->id = f->cookie;
         return ocelot_flower_parse_action(f, ocelot_rule);
 }
@@ -218,7 +212,7 @@ static int ocelot_flower_destroy(struct flow_cls_offload *f,
         struct ocelot_ace_rule rule;
         int ret;
 
-        rule.prio = get_prio(f->common.prio);
+        rule.prio = f->common.prio;
         rule.port = port_block->port;
         rule.id = f->cookie;
 
@@ -236,7 +230,7 @@ static int ocelot_flower_stats_update(struct flow_cls_offload *f,
         struct ocelot_ace_rule rule;
         int ret;
 
-        rule.prio = get_prio(f->common.prio);
+        rule.prio = f->common.prio;
         rule.port = port_block->port;
         rule.id = f->cookie;
         ret = ocelot_ace_rule_stats_update(&rule);
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index d8b7fba96d58..337b0cbfd153 100644
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -3919,7 +3919,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
          * setup (if available). */
         status = myri10ge_request_irq(mgp);
         if (status != 0)
-                goto abort_with_firmware;
+                goto abort_with_slices;
         myri10ge_free_irq(mgp);
 
         /* Save configuration space to be restored if the
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
index 4054b70d7719..5afcb3c4c2ef 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
@@ -1163,7 +1163,7 @@ mem_op_stack(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta,
              bool clr_gpr, lmem_step step)
 {
         s32 off = nfp_prog->stack_frame_depth + meta->insn.off + ptr_off;
-        bool first = true, last;
+        bool first = true, narrow_ld, last;
         bool needs_inc = false;
         swreg stack_off_reg;
         u8 prev_gpr = 255;
@@ -1209,13 +1209,22 @@ mem_op_stack(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta,
 
                 needs_inc = true;
         }
+
+        narrow_ld = clr_gpr && size < 8;
+
         if (lm3) {
+                unsigned int nop_cnt;
+
                 emit_csr_wr(nfp_prog, imm_b(nfp_prog), NFP_CSR_ACT_LM_ADDR3);
-                /* For size < 4 one slot will be filled by zeroing of upper. */
-                wrp_nops(nfp_prog, clr_gpr && size < 8 ? 2 : 3);
+                /* For size < 4 one slot will be filled by zeroing of upper,
+                 * but be careful, that zeroing could be eliminated by zext
+                 * optimization.
+                 */
+                nop_cnt = narrow_ld && meta->flags & FLAG_INSN_DO_ZEXT ? 2 : 3;
+                wrp_nops(nfp_prog, nop_cnt);
         }
 
-        if (clr_gpr && size < 8)
+        if (narrow_ld)
                 wrp_zext(nfp_prog, meta, gpr);
 
         while (size) {
diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index e209f150c5f2..457bdc60f3ee 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -1409,13 +1409,21 @@ nfp_flower_setup_indr_tc_block(struct net_device *netdev, struct nfp_app *app,
         struct nfp_flower_priv *priv = app->priv;
         struct flow_block_cb *block_cb;
 
-        if (f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS &&
-            !(f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS &&
-              nfp_flower_internal_port_can_offload(app, netdev)))
+        if ((f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS &&
+             !nfp_flower_internal_port_can_offload(app, netdev)) ||
+            (f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS &&
+             nfp_flower_internal_port_can_offload(app, netdev)))
                 return -EOPNOTSUPP;
 
         switch (f->command) {
         case FLOW_BLOCK_BIND:
+                cb_priv = nfp_flower_indr_block_cb_priv_lookup(app, netdev);
+                if (cb_priv &&
+                    flow_block_cb_is_busy(nfp_flower_setup_indr_block_cb,
+                                          cb_priv,
+                                          &nfp_block_cb_list))
+                        return -EBUSY;
+
                 cb_priv = kmalloc(sizeof(*cb_priv), GFP_KERNEL);
                 if (!cb_priv)
                         return -ENOMEM;
diff --git a/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c b/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c
index 86e968cd5ffd..124a43dc136a 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c
@@ -93,7 +93,7 @@ nfp_flower_install_rate_limiter(struct nfp_app *app, struct net_device *netdev,
                 return -EOPNOTSUPP;
         }
 
-        if (flow->common.prio != (1 << 16)) {
+        if (flow->common.prio != 1) {
                 NL_SET_ERR_MSG_MOD(extack, "unsupported offload: qos rate limit offload requires highest priority");
                 return -EOPNOTSUPP;
         }
diff --git a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
index a7a80f4b722a..f0ee982eb1b5 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
@@ -328,13 +328,13 @@ nfp_tun_neigh_event_handler(struct notifier_block *nb, unsigned long event,
 
         flow.daddr = *(__be32 *)n->primary_key;
 
-        /* Only concerned with route changes for representors. */
-        if (!nfp_netdev_is_nfp_repr(n->dev))
-                return NOTIFY_DONE;
-
         app_priv = container_of(nb, struct nfp_flower_priv, tun.neigh_nb);
         app = app_priv->app;
 
+        if (!nfp_netdev_is_nfp_repr(n->dev) &&
+            !nfp_flower_internal_port_can_offload(app, n->dev))
+                return NOTIFY_DONE;
+
         /* Only concerned with changes to routes already added to NFP. */
         if (!nfp_tun_has_route(app, flow.daddr))
                 return NOTIFY_DONE;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index 829dd60ab937..1efff7f68ef6 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -1325,7 +1325,7 @@ static int qed_slowpath_start(struct qed_dev *cdev,
                                               &drv_version);
                 if (rc) {
                         DP_NOTICE(cdev, "Failed sending drv version command\n");
-                        return rc;
+                        goto err4;
                 }
         }
 
@@ -1333,6 +1333,8 @@ static int qed_slowpath_start(struct qed_dev *cdev,
 
         return 0;
 
+err4:
+        qed_ll2_dealloc_if(cdev);
 err3:
         qed_hw_stop(cdev);
 err2:
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index e1dd6ea60d67..bae0074ab9aa 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -5921,6 +5921,7 @@ static struct sk_buff *rtl8169_try_rx_copy(void *data,
         skb = napi_alloc_skb(&tp->napi, pkt_size);
         if (skb)
                 skb_copy_to_linear_data(skb, data, pkt_size);
+        dma_sync_single_for_device(d, addr, pkt_size, DMA_FROM_DEVICE);
 
         return skb;
 }
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index ef8f08931fe8..6cacd5e893ac 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Renesas Ethernet AVB device driver
  *
- * Copyright (C) 2014-2015 Renesas Electronics Corporation
+ * Copyright (C) 2014-2019 Renesas Electronics Corporation
  * Copyright (C) 2015 Renesas Solutions Corp.
  * Copyright (C) 2015-2016 Cogent Embedded, Inc. <source@cogentembedded.com>
  *
@@ -513,7 +513,10 @@ static void ravb_get_tx_tstamp(struct net_device *ndev)
                         kfree(ts_skb);
                         if (tag == tfa_tag) {
                                 skb_tstamp_tx(skb, &shhwtstamps);
+                                dev_consume_skb_any(skb);
                                 break;
+                        } else {
+                                dev_kfree_skb_any(skb);
                         }
                 }
                 ravb_modify(ndev, TCCR, TCCR_TFR, TCCR_TFR);
@@ -1564,7 +1567,7 @@ static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                         }
                         goto unmap;
                 }
-                ts_skb->skb = skb;
+                ts_skb->skb = skb_get(skb);
                 ts_skb->tag = priv->ts_skb_tag++;
                 priv->ts_skb_tag &= 0x3ff;
                 list_add_tail(&ts_skb->list, &priv->ts_skb_list);
@@ -1693,6 +1696,7 @@ static int ravb_close(struct net_device *ndev)
         /* Clear the timestamp list */
         list_for_each_entry_safe(ts_skb, ts_skb2, &priv->ts_skb_list, list) {
                 list_del(&ts_skb->list);
+                kfree_skb(ts_skb->skb);
                 kfree(ts_skb);
         }
 
diff --git a/drivers/net/ethernet/seeq/sgiseeq.c b/drivers/net/ethernet/seeq/sgiseeq.c
index 7a5e6c5abb57..276c7cae7cee 100644
--- a/drivers/net/ethernet/seeq/sgiseeq.c
+++ b/drivers/net/ethernet/seeq/sgiseeq.c
@@ -794,15 +794,16 @@ static int sgiseeq_probe(struct platform_device *pdev)
                 printk(KERN_ERR "Sgiseeq: Cannot register net device, "
                        "aborting.\n");
                 err = -ENODEV;
-                goto err_out_free_page;
+                goto err_out_free_attrs;
         }
 
         printk(KERN_INFO "%s: %s %pM\n", dev->name, sgiseeqstr, dev->dev_addr);
 
         return 0;
 
-err_out_free_page:
-        free_page((unsigned long) sp->srings);
+err_out_free_attrs:
+        dma_free_attrs(&pdev->dev, sizeof(*sp->srings), sp->srings,
+                       sp->srings_dma, DMA_ATTR_NON_CONSISTENT);
 err_out_free_dev:
         free_netdev(dev);
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index 4644b2aeeba1..e2e469c37a4d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -1194,10 +1194,8 @@ static int phy_power_on(struct rk_priv_data *bsp_priv, bool enable)
         int ret;
         struct device *dev = &bsp_priv->pdev->dev;
 
-        if (!ldo) {
-                dev_err(dev, "no regulator found\n");
-                return -1;
-        }
+        if (!ldo)
+                return 0;
 
         if (enable) {
                 ret = regulator_enable(ldo);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
index 37c0bc699cd9..6c305b6ecad0 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
@@ -94,7 +94,7 @@ static int tc_fill_entry(struct stmmac_priv *priv,
         struct stmmac_tc_entry *entry, *frag = NULL;
         struct tc_u32_sel *sel = cls->knode.sel;
         u32 off, data, mask, real_off, rem;
-        u32 prio = cls->common.prio;
+        u32 prio = cls->common.prio << 16;
         int ret;
 
         /* Only 1 match per entry */
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 32a89744972d..a46b8b2e44e1 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -2775,6 +2775,7 @@ static int cpsw_probe(struct platform_device *pdev)
         if (!cpsw)
                 return -ENOMEM;
 
+        platform_set_drvdata(pdev, cpsw);
         cpsw->dev = dev;
 
         mode = devm_gpiod_get_array_optional(dev, "mode", GPIOD_OUT_LOW);
@@ -2879,7 +2880,6 @@ static int cpsw_probe(struct platform_device *pdev)
                 goto clean_cpts;
         }
 
-        platform_set_drvdata(pdev, cpsw);
         priv = netdev_priv(ndev);
         priv->cpsw = cpsw;
         priv->ndev = ndev;
diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c
index 8479a440527b..12466a72cefc 100644
--- a/drivers/net/ethernet/toshiba/tc35815.c
+++ b/drivers/net/ethernet/toshiba/tc35815.c
@@ -1504,7 +1504,7 @@ tc35815_rx(struct net_device *dev, int limit)
                         pci_unmap_single(lp->pci_dev,
                                          lp->rx_skbs[cur_bd].skb_dma,
                                          RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
-                        if (!HAVE_DMA_RXALIGN(lp) && NET_IP_ALIGN)
+                        if (!HAVE_DMA_RXALIGN(lp) && NET_IP_ALIGN != 0)
                                 memmove(skb->data, skb->data - NET_IP_ALIGN,
                                         pkt_len);
                         data = skb_put(skb, pkt_len);
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
index 78a7de3fb622..c62f474b6d08 100644
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
@@ -371,9 +371,10 @@ tsi108_stat_carry_one(int carry, int carry_bit, int carry_shift,
 static void tsi108_stat_carry(struct net_device *dev)
 {
         struct tsi108_prv_data *data = netdev_priv(dev);
+        unsigned long flags;
         u32 carry1, carry2;
 
-        spin_lock_irq(&data->misclock);
+        spin_lock_irqsave(&data->misclock, flags);
 
         carry1 = TSI_READ(TSI108_STAT_CARRY1);
         carry2 = TSI_READ(TSI108_STAT_CARRY2);
@@ -441,7 +442,7 @@ static void tsi108_stat_carry(struct net_device *dev)
                               TSI108_STAT_TXPAUSEDROP_CARRY,
                               &data->tx_pause_drop);
 
-        spin_unlock_irq(&data->misclock);
+        spin_unlock_irqrestore(&data->misclock, flags);
 }
 
 /* Read a stat counter atomically with respect to carries.
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 3544e1991579..e8fce6d715ef 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -1239,12 +1239,15 @@ static void netvsc_get_stats64(struct net_device *net,
                                struct rtnl_link_stats64 *t)
 {
         struct net_device_context *ndev_ctx = netdev_priv(net);
-        struct netvsc_device *nvdev = rcu_dereference_rtnl(ndev_ctx->nvdev);
+        struct netvsc_device *nvdev;
         struct netvsc_vf_pcpu_stats vf_tot;
         int i;
 
+        rcu_read_lock();
+
+        nvdev = rcu_dereference(ndev_ctx->nvdev);
         if (!nvdev)
-                return;
+                goto out;
 
         netdev_stats_to_stats64(t, &net->stats);
 
@@ -1283,6 +1286,8 @@ static void netvsc_get_stats64(struct net_device *net,
                 t->rx_packets   += packets;
                 t->multicast    += multicast;
         }
+out:
+        rcu_read_unlock();
 }
 
 static int netvsc_set_mac_addr(struct net_device *ndev, void *p)
diff --git a/drivers/net/ieee802154/mac802154_hwsim.c b/drivers/net/ieee802154/mac802154_hwsim.c
index b41696e16bdc..c20e7ef18bc9 100644
--- a/drivers/net/ieee802154/mac802154_hwsim.c
+++ b/drivers/net/ieee802154/mac802154_hwsim.c
@@ -802,7 +802,7 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev,
                 err = hwsim_subscribe_all_others(phy);
                 if (err < 0) {
                         mutex_unlock(&hwsim_phys_lock);
-                        goto err_reg;
+                        goto err_subscribe;
                 }
         }
         list_add_tail(&phy->list, &hwsim_phys);
@@ -812,6 +812,8 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev,
 
         return idx;
 
+err_subscribe:
+        ieee802154_unregister_hw(phy->hw);
 err_reg:
         kfree(pib);
 err_pib:
@@ -901,9 +903,9 @@ static __init int hwsim_init_module(void)
         return 0;
 
 platform_drv:
-        genl_unregister_family(&hwsim_genl_family);
-platform_dev:
         platform_device_unregister(mac802154hwsim_dev);
+platform_dev:
+        genl_unregister_family(&hwsim_genl_family);
         return rc;
 }
 
diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index c5c417a3c0ce..bcc40a236624 100644
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -73,46 +73,47 @@ static void nsim_dev_port_debugfs_exit(struct nsim_dev_port *nsim_dev_port)
         debugfs_remove_recursive(nsim_dev_port->ddir);
 }
 
+static struct net *nsim_devlink_net(struct devlink *devlink)
+{
+        return &init_net;
+}
+
 static u64 nsim_dev_ipv4_fib_resource_occ_get(void *priv)
 {
-        struct nsim_dev *nsim_dev = priv;
+        struct net *net = priv;
 
-        return nsim_fib_get_val(nsim_dev->fib_data,
-                                NSIM_RESOURCE_IPV4_FIB, false);
+        return nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB, false);
 }
 
 static u64 nsim_dev_ipv4_fib_rules_res_occ_get(void *priv)
 {
-        struct nsim_dev *nsim_dev = priv;
+        struct net *net = priv;
 
-        return nsim_fib_get_val(nsim_dev->fib_data,
-                                NSIM_RESOURCE_IPV4_FIB_RULES, false);
+        return nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB_RULES, false);
 }
 
 static u64 nsim_dev_ipv6_fib_resource_occ_get(void *priv)
 {
-        struct nsim_dev *nsim_dev = priv;
+        struct net *net = priv;
 
-        return nsim_fib_get_val(nsim_dev->fib_data,
-                                NSIM_RESOURCE_IPV6_FIB, false);
+        return nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB, false);
 }
 
 static u64 nsim_dev_ipv6_fib_rules_res_occ_get(void *priv)
 {
-        struct nsim_dev *nsim_dev = priv;
+        struct net *net = priv;
 
-        return nsim_fib_get_val(nsim_dev->fib_data,
-                                NSIM_RESOURCE_IPV6_FIB_RULES, false);
+        return nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB_RULES, false);
 }
 
 static int nsim_dev_resources_register(struct devlink *devlink)
 {
-        struct nsim_dev *nsim_dev = devlink_priv(devlink);
         struct devlink_resource_size_params params = {
                 .size_max = (u64)-1,
                 .size_granularity = 1,
                 .unit = DEVLINK_RESOURCE_UNIT_ENTRY
         };
+        struct net *net = nsim_devlink_net(devlink);
         int err;
         u64 n;
 
@@ -126,8 +127,7 @@ static int nsim_dev_resources_register(struct devlink *devlink)
                 goto out;
         }
 
-        n = nsim_fib_get_val(nsim_dev->fib_data,
-                             NSIM_RESOURCE_IPV4_FIB, true);
+        n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB, true);
         err = devlink_resource_register(devlink, "fib", n,
                                         NSIM_RESOURCE_IPV4_FIB,
                                         NSIM_RESOURCE_IPV4, &params);
@@ -136,8 +136,7 @@ static int nsim_dev_resources_register(struct devlink *devlink)
                 return err;
         }
 
-        n = nsim_fib_get_val(nsim_dev->fib_data,
-                             NSIM_RESOURCE_IPV4_FIB_RULES, true);
+        n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV4_FIB_RULES, true);
         err = devlink_resource_register(devlink, "fib-rules", n,
                                         NSIM_RESOURCE_IPV4_FIB_RULES,
                                         NSIM_RESOURCE_IPV4, &params);
@@ -156,8 +155,7 @@ static int nsim_dev_resources_register(struct devlink *devlink)
                 goto out;
         }
 
-        n = nsim_fib_get_val(nsim_dev->fib_data,
-                             NSIM_RESOURCE_IPV6_FIB, true);
+        n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB, true);
         err = devlink_resource_register(devlink, "fib", n,
                                         NSIM_RESOURCE_IPV6_FIB,
                                         NSIM_RESOURCE_IPV6, &params);
@@ -166,8 +164,7 @@ static int nsim_dev_resources_register(struct devlink *devlink)
                 return err;
         }
 
-        n = nsim_fib_get_val(nsim_dev->fib_data,
-                             NSIM_RESOURCE_IPV6_FIB_RULES, true);
+        n = nsim_fib_get_val(net, NSIM_RESOURCE_IPV6_FIB_RULES, true);
         err = devlink_resource_register(devlink, "fib-rules", n,
                                         NSIM_RESOURCE_IPV6_FIB_RULES,
                                         NSIM_RESOURCE_IPV6, &params);
@@ -179,19 +176,19 @@ static int nsim_dev_resources_register(struct devlink *devlink)
         devlink_resource_occ_get_register(devlink,
                                           NSIM_RESOURCE_IPV4_FIB,
                                           nsim_dev_ipv4_fib_resource_occ_get,
-                                          nsim_dev);
+                                          net);
         devlink_resource_occ_get_register(devlink,
                                           NSIM_RESOURCE_IPV4_FIB_RULES,
                                           nsim_dev_ipv4_fib_rules_res_occ_get,
-                                          nsim_dev);
+                                          net);
         devlink_resource_occ_get_register(devlink,
                                           NSIM_RESOURCE_IPV6_FIB,
                                           nsim_dev_ipv6_fib_resource_occ_get,
-                                          nsim_dev);
+                                          net);
         devlink_resource_occ_get_register(devlink,
                                           NSIM_RESOURCE_IPV6_FIB_RULES,
                                           nsim_dev_ipv6_fib_rules_res_occ_get,
-                                          nsim_dev);
+                                          net);
 out:
         return err;
 }
@@ -199,11 +196,11 @@ out:
 static int nsim_dev_reload(struct devlink *devlink,
                            struct netlink_ext_ack *extack)
 {
-        struct nsim_dev *nsim_dev = devlink_priv(devlink);
         enum nsim_resource_id res_ids[] = {
                 NSIM_RESOURCE_IPV4_FIB, NSIM_RESOURCE_IPV4_FIB_RULES,
                 NSIM_RESOURCE_IPV6_FIB, NSIM_RESOURCE_IPV6_FIB_RULES
         };
+        struct net *net = nsim_devlink_net(devlink);
         int i;
 
         for (i = 0; i < ARRAY_SIZE(res_ids); ++i) {
@@ -212,8 +209,7 @@ static int nsim_dev_reload(struct devlink *devlink,
 
                 err = devlink_resource_size_get(devlink, res_ids[i], &val);
                 if (!err) {
-                        err = nsim_fib_set_max(nsim_dev->fib_data,
-                                               res_ids[i], val, extack);
+                        err = nsim_fib_set_max(net, res_ids[i], val, extack);
                         if (err)
                                 return err;
                 }
@@ -285,15 +281,9 @@ nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev, unsigned int port_count)
         mutex_init(&nsim_dev->port_list_lock);
         nsim_dev->fw_update_status = true;
 
-        nsim_dev->fib_data = nsim_fib_create();
-        if (IS_ERR(nsim_dev->fib_data)) {
-                err = PTR_ERR(nsim_dev->fib_data);
-                goto err_devlink_free;
-        }
-
         err = nsim_dev_resources_register(devlink);
         if (err)
-                goto err_fib_destroy;
+                goto err_devlink_free;
 
         err = devlink_register(devlink, &nsim_bus_dev->dev);
         if (err)
@@ -315,8 +305,6 @@ err_dl_unregister:
         devlink_unregister(devlink);
 err_resources_unregister:
         devlink_resources_unregister(devlink, NULL);
-err_fib_destroy:
-        nsim_fib_destroy(nsim_dev->fib_data);
 err_devlink_free:
         devlink_free(devlink);
         return ERR_PTR(err);
@@ -330,7 +318,6 @@ static void nsim_dev_destroy(struct nsim_dev *nsim_dev)
         nsim_dev_debugfs_exit(nsim_dev);
         devlink_unregister(devlink);
         devlink_resources_unregister(devlink, NULL);
-        nsim_fib_destroy(nsim_dev->fib_data);
         mutex_destroy(&nsim_dev->port_list_lock);
         devlink_free(devlink);
 }
diff --git a/drivers/net/netdevsim/fib.c b/drivers/net/netdevsim/fib.c
index 8c57ba747772..f61d094746c0 100644
--- a/drivers/net/netdevsim/fib.c
+++ b/drivers/net/netdevsim/fib.c
@@ -18,6 +18,7 @@
 #include <net/ip_fib.h>
 #include <net/ip6_fib.h>
 #include <net/fib_rules.h>
+#include <net/netns/generic.h>
 
 #include "netdevsim.h"
 
@@ -32,14 +33,15 @@ struct nsim_per_fib_data {
 };
 
 struct nsim_fib_data {
-        struct notifier_block fib_nb;
         struct nsim_per_fib_data ipv4;
         struct nsim_per_fib_data ipv6;
 };
 
-u64 nsim_fib_get_val(struct nsim_fib_data *fib_data,
-                     enum nsim_resource_id res_id, bool max)
+static unsigned int nsim_fib_net_id;
+
+u64 nsim_fib_get_val(struct net *net, enum nsim_resource_id res_id, bool max)
 {
+        struct nsim_fib_data *fib_data = net_generic(net, nsim_fib_net_id);
         struct nsim_fib_entry *entry;
 
         switch (res_id) {
@@ -62,10 +64,10 @@ u64 nsim_fib_get_val(struct nsim_fib_data *fib_data,
         return max ? entry->max : entry->num;
 }
 
-int nsim_fib_set_max(struct nsim_fib_data *fib_data,
-                     enum nsim_resource_id res_id, u64 val,
+int nsim_fib_set_max(struct net *net, enum nsim_resource_id res_id, u64 val,
                      struct netlink_ext_ack *extack)
 {
+        struct nsim_fib_data *fib_data = net_generic(net, nsim_fib_net_id);
         struct nsim_fib_entry *entry;
         int err = 0;
 
@@ -118,9 +120,9 @@ static int nsim_fib_rule_account(struct nsim_fib_entry *entry, bool add,
         return err;
 }
 
-static int nsim_fib_rule_event(struct nsim_fib_data *data,
-                               struct fib_notifier_info *info, bool add)
+static int nsim_fib_rule_event(struct fib_notifier_info *info, bool add)
 {
+        struct nsim_fib_data *data = net_generic(info->net, nsim_fib_net_id);
         struct netlink_ext_ack *extack = info->extack;
         int err = 0;
 
@@ -155,9 +157,9 @@ static int nsim_fib_account(struct nsim_fib_entry *entry, bool add,
         return err;
 }
 
-static int nsim_fib_event(struct nsim_fib_data *data,
-                          struct fib_notifier_info *info, bool add)
+static int nsim_fib_event(struct fib_notifier_info *info, bool add)
 {
+        struct nsim_fib_data *data = net_generic(info->net, nsim_fib_net_id);
         struct netlink_ext_ack *extack = info->extack;
         int err = 0;
 
@@ -176,22 +178,18 @@ static int nsim_fib_event(struct nsim_fib_data *data,
 static int nsim_fib_event_nb(struct notifier_block *nb, unsigned long event,
                              void *ptr)
 {
-        struct nsim_fib_data *data = container_of(nb, struct nsim_fib_data,
-                                                  fib_nb);
         struct fib_notifier_info *info = ptr;
         int err = 0;
 
         switch (event) {
         case FIB_EVENT_RULE_ADD: /* fall through */
         case FIB_EVENT_RULE_DEL:
-                err = nsim_fib_rule_event(data, info,
-                                          event == FIB_EVENT_RULE_ADD);
+                err = nsim_fib_rule_event(info, event == FIB_EVENT_RULE_ADD);
                 break;
 
         case FIB_EVENT_ENTRY_ADD:  /* fall through */
         case FIB_EVENT_ENTRY_DEL:
-                err = nsim_fib_event(data, info,
-                                     event == FIB_EVENT_ENTRY_ADD);
+                err = nsim_fib_event(info, event == FIB_EVENT_ENTRY_ADD);
                 break;
         }
 
@@ -201,23 +199,30 @@ static int nsim_fib_event_nb(struct notifier_block *nb, unsigned long event,
 /* inconsistent dump, trying again */
 static void nsim_fib_dump_inconsistent(struct notifier_block *nb)
 {
-        struct nsim_fib_data *data = container_of(nb, struct nsim_fib_data,
-                                                  fib_nb);
+        struct nsim_fib_data *data;
+        struct net *net;
+
+        rcu_read_lock();
+        for_each_net_rcu(net) {
+                data = net_generic(net, nsim_fib_net_id);
+
+                data->ipv4.fib.num = 0ULL;
+                data->ipv4.rules.num = 0ULL;
 
-        data->ipv4.fib.num = 0ULL;
-        data->ipv4.rules.num = 0ULL;
-        data->ipv6.fib.num = 0ULL;
-        data->ipv6.rules.num = 0ULL;
+                data->ipv6.fib.num = 0ULL;
+                data->ipv6.rules.num = 0ULL;
+        }
+        rcu_read_unlock();
 }
 
-struct nsim_fib_data *nsim_fib_create(void)
-{
-        struct nsim_fib_data *data;
-        int err;
+static struct notifier_block nsim_fib_nb = {
+        .notifier_call = nsim_fib_event_nb,
+};
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
-        if (!data)
-                return ERR_PTR(-ENOMEM);
+/* Initialize per network namespace state */
+static int __net_init nsim_fib_netns_init(struct net *net)
+{
+        struct nsim_fib_data *data = net_generic(net, nsim_fib_net_id);
 
         data->ipv4.fib.max = (u64)-1;
         data->ipv4.rules.max = (u64)-1;
@@ -225,22 +230,37 @@ struct nsim_fib_data *nsim_fib_create(void)
         data->ipv6.fib.max = (u64)-1;
         data->ipv6.rules.max = (u64)-1;
 
-        data->fib_nb.notifier_call = nsim_fib_event_nb;
-        err = register_fib_notifier(&data->fib_nb, nsim_fib_dump_inconsistent);
-        if (err) {
-                pr_err("Failed to register fib notifier\n");
-                goto err_out;
-        }
+        return 0;
+}
 
-        return data;
+static struct pernet_operations nsim_fib_net_ops = {
+        .init = nsim_fib_netns_init,
+        .id   = &nsim_fib_net_id,
+        .size = sizeof(struct nsim_fib_data),
+};
 
-err_out:
-        kfree(data);
-        return ERR_PTR(err);
+void nsim_fib_exit(void)
+{
+        unregister_pernet_subsys(&nsim_fib_net_ops);
+        unregister_fib_notifier(&nsim_fib_nb);
 }
 
-void nsim_fib_destroy(struct nsim_fib_data *data)
+int nsim_fib_init(void)
 {
-        unregister_fib_notifier(&data->fib_nb);
-        kfree(data);
+        int err;
+
+        err = register_pernet_subsys(&nsim_fib_net_ops);
+        if (err < 0) {
+                pr_err("Failed to register pernet subsystem\n");
+                goto err_out;
+        }
+
+        err = register_fib_notifier(&nsim_fib_nb, nsim_fib_dump_inconsistent);
+        if (err < 0) {
+                pr_err("Failed to register fib notifier\n");
+                goto err_out;
+        }
+
+err_out:
+        return err;
 }
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c
index 0740940f41b1..55f57f76d01b 100644
--- a/drivers/net/netdevsim/netdev.c
+++ b/drivers/net/netdevsim/netdev.c
@@ -357,12 +357,18 @@ static int __init nsim_module_init(void)
         if (err)
                 goto err_dev_exit;
 
-        err = rtnl_link_register(&nsim_link_ops);
+        err = nsim_fib_init();
         if (err)
                 goto err_bus_exit;
 
+        err = rtnl_link_register(&nsim_link_ops);
+        if (err)
+                goto err_fib_exit;
+
         return 0;
 
+err_fib_exit:
+        nsim_fib_exit();
 err_bus_exit:
         nsim_bus_exit();
 err_dev_exit:
@@ -373,6 +379,7 @@ err_dev_exit:
 static void __exit nsim_module_exit(void)
 {
         rtnl_link_unregister(&nsim_link_ops);
+        nsim_fib_exit();
         nsim_bus_exit();
         nsim_dev_exit();
 }
diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h
index 79c05af2a7c0..9404637d34b7 100644
--- a/drivers/net/netdevsim/netdevsim.h
+++ b/drivers/net/netdevsim/netdevsim.h
@@ -169,12 +169,10 @@ int nsim_dev_port_add(struct nsim_bus_dev *nsim_bus_dev,
 int nsim_dev_port_del(struct nsim_bus_dev *nsim_bus_dev,
                       unsigned int port_index);
 
-struct nsim_fib_data *nsim_fib_create(void);
-void nsim_fib_destroy(struct nsim_fib_data *fib_data);
-u64 nsim_fib_get_val(struct nsim_fib_data *fib_data,
-                     enum nsim_resource_id res_id, bool max);
-int nsim_fib_set_max(struct nsim_fib_data *fib_data,
-                     enum nsim_resource_id res_id, u64 val,
+int nsim_fib_init(void);
+void nsim_fib_exit(void);
+u64 nsim_fib_get_val(struct net *net, enum nsim_resource_id res_id, bool max);
+int nsim_fib_set_max(struct net *net, enum nsim_resource_id res_id, u64 val,
                      struct netlink_ext_ack *extack);
 
 #if IS_ENABLED(CONFIG_XFRM_OFFLOAD)
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 222ccd9ecfce..6ad8b1c63c34 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -257,36 +257,20 @@ static int at803x_config_init(struct phy_device *phydev)
          *   after HW reset: RX delay enabled and TX delay disabled
          *   after SW reset: RX delay enabled, while TX delay retains the
          *   value before reset.
-         *
-         * So let's first disable the RX and TX delays in PHY and enable
-         * them based on the mode selected (this also takes care of RGMII
-         * mode where we expect delays to be disabled)
          */
-
-        ret = at803x_disable_rx_delay(phydev);
-        if (ret < 0)
-                return ret;
-        ret = at803x_disable_tx_delay(phydev);
-        if (ret < 0)
-                return ret;
-
         if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
-            phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) {
-                /* If RGMII_ID or RGMII_RXID are specified enable RX delay,
-                 * otherwise keep it disabled
-                 */
+            phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
                 ret = at803x_enable_rx_delay(phydev);
-                if (ret < 0)
-                        return ret;
-        }
+        else
+                ret = at803x_disable_rx_delay(phydev);
+        if (ret < 0)
+                return ret;
 
         if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
-            phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) {
-                /* If RGMII_ID or RGMII_TXID are specified enable TX delay,
-                 * otherwise keep it disabled
-                 */
+            phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
                 ret = at803x_enable_tx_delay(phydev);
-        }
+        else
+                ret = at803x_disable_tx_delay(phydev);
 
         return ret;
 }
diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
index b9d4145781ca..7935593debb1 100644
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -219,6 +219,20 @@ int genphy_c45_read_link(struct phy_device *phydev)
         int val, devad;
         bool link = true;
 
+        if (phydev->c45_ids.devices_in_package & MDIO_DEVS_AN) {
+                val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_CTRL1);
+                if (val < 0)
+                        return val;
+
+                /* Autoneg is being started, therefore disregard current
+                 * link status and report link as down.
+                 */
+                if (val & MDIO_AN_CTRL1_RESTART) {
+                        phydev->link = 0;
+                        return 0;
+                }
+        }
+
         while (mmd_mask && link) {
                 devad = __ffs(mmd_mask);
                 mmd_mask &= ~BIT(devad);
@@ -509,6 +523,32 @@ int genphy_c45_read_status(struct phy_device *phydev)
 }
 EXPORT_SYMBOL_GPL(genphy_c45_read_status);
 
+/**
+ * genphy_c45_config_aneg - restart auto-negotiation or forced setup
+ * @phydev: target phy_device struct
+ *
+ * Description: If auto-negotiation is enabled, we configure the
+ *   advertising, and then restart auto-negotiation.  If it is not
+ *   enabled, then we force a configuration.
+ */
+int genphy_c45_config_aneg(struct phy_device *phydev)
+{
+        bool changed = false;
+        int ret;
+
+        if (phydev->autoneg == AUTONEG_DISABLE)
+                return genphy_c45_pma_setup_forced(phydev);
+
+        ret = genphy_c45_an_config_aneg(phydev);
+        if (ret < 0)
+                return ret;
+        if (ret > 0)
+                changed = true;
+
+        return genphy_c45_check_and_restart_aneg(phydev, changed);
+}
+EXPORT_SYMBOL_GPL(genphy_c45_config_aneg);
+
 /* The gen10g_* functions are the old Clause 45 stub */
 
 int gen10g_config_aneg(struct phy_device *phydev)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index ef7aa738e0dc..6b0f89369b46 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -507,7 +507,7 @@ static int phy_config_aneg(struct phy_device *phydev)
          * allowed to call genphy_config_aneg()
          */
         if (phydev->is_c45 && !(phydev->c45_ids.devices_in_package & BIT(0)))
-                return -EOPNOTSUPP;
+                return genphy_c45_config_aneg(phydev);
 
         return genphy_config_aneg(phydev);
 }
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 7ddd91df99e3..27ebc2c6c2d0 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1752,7 +1752,17 @@ EXPORT_SYMBOL(genphy_aneg_done);
  */
 int genphy_update_link(struct phy_device *phydev)
 {
-        int status;
+        int status = 0, bmcr;
+
+        bmcr = phy_read(phydev, MII_BMCR);
+        if (bmcr < 0)
+                return bmcr;
+
+        /* Autoneg is being started, therefore disregard BMSR value and
+         * report link as down.
+         */
+        if (bmcr & BMCR_ANRESTART)
+                goto done;
 
         /* The link state is latched low so that momentary link
          * drops can be detected. Do not double-read the status
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index abfa0da9bbd2..e8089def5a46 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1004,6 +1004,8 @@ static void __team_compute_features(struct team *team)
 
         team->dev->vlan_features = vlan_features;
         team->dev->hw_enc_features = enc_features | NETIF_F_GSO_ENCAP_ALL |
+                                     NETIF_F_HW_VLAN_CTAG_TX |
+                                     NETIF_F_HW_VLAN_STAG_TX |
                                      NETIF_F_GSO_UDP_L4;
         team->dev->hard_header_len = max_hard_header_len;
 
diff --git a/drivers/net/usb/cx82310_eth.c b/drivers/net/usb/cx82310_eth.c
index 5519248a791e..32b08b18e120 100644
--- a/drivers/net/usb/cx82310_eth.c
+++ b/drivers/net/usb/cx82310_eth.c
@@ -163,7 +163,8 @@ static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf)
         }
         if (!timeout) {
                 dev_err(&udev->dev, "firmware not ready in time\n");
-                return -ETIMEDOUT;
+                ret = -ETIMEDOUT;
+                goto err;
         }
 
         /* enable ethernet mode (?) */
diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c
index d62b6706a537..fc5895f85cee 100644
--- a/drivers/net/usb/kalmia.c
+++ b/drivers/net/usb/kalmia.c
@@ -113,16 +113,16 @@ kalmia_init_and_get_ethernet_addr(struct usbnet *dev, u8 *ethernet_addr)
         status = kalmia_send_init_packet(dev, usb_buf, ARRAY_SIZE(init_msg_1),
                                          usb_buf, 24);
         if (status != 0)
-                return status;
+                goto out;
 
         memcpy(usb_buf, init_msg_2, 12);
         status = kalmia_send_init_packet(dev, usb_buf, ARRAY_SIZE(init_msg_2),
                                          usb_buf, 28);
         if (status != 0)
-                return status;
+                goto out;
 
         memcpy(ethernet_addr, usb_buf + 10, ETH_ALEN);
-
+out:
         kfree(usb_buf);
         return status;
 }
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 3d92ea6fcc02..f033fee225a1 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -3792,7 +3792,7 @@ static int lan78xx_probe(struct usb_interface *intf,
         ret = register_netdev(netdev);
         if (ret != 0) {
                 netif_err(dev, probe, netdev, "couldn't register the device\n");
-                goto out3;
+                goto out4;
         }
 
         usb_set_intfdata(intf, dev);
@@ -3807,12 +3807,14 @@ static int lan78xx_probe(struct usb_interface *intf,
 
         ret = lan78xx_phy_init(dev);
         if (ret < 0)
-                goto out4;
+                goto out5;
 
         return 0;
 
-out4:
+out5:
         unregister_netdev(netdev);
+out4:
+        usb_free_urb(dev->urb_intr);
 out3:
         lan78xx_unbind(dev, intf);
 out2:
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 0cc03a9ff545..04137ac373b0 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -799,8 +799,11 @@ int get_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data)
         ret = usb_control_msg(tp->udev, usb_rcvctrlpipe(tp->udev, 0),
                               RTL8152_REQ_GET_REGS, RTL8152_REQT_READ,
                               value, index, tmp, size, 500);
+        if (ret < 0)
+                memset(data, 0xff, size);
+        else
+                memcpy(data, tmp, size);
 
-        memcpy(data, tmp, size);
         kfree(tmp);
 
         return ret;
@@ -4018,8 +4021,7 @@ static int rtl8152_close(struct net_device *netdev)
 #ifdef CONFIG_PM_SLEEP
         unregister_pm_notifier(&tp->pm_notifier);
 #endif
-        if (!test_bit(RTL8152_UNPLUG, &tp->flags))
-                napi_disable(&tp->napi);
+        napi_disable(&tp->napi);
         clear_bit(WORK_ENABLE, &tp->flags);
         usb_kill_urb(tp->intr_urb);
         cancel_delayed_work_sync(&tp->schedule);
@@ -5350,7 +5352,6 @@ static int rtl8152_probe(struct usb_interface *intf,
         return 0;
 
 out1:
-        netif_napi_del(&tp->napi);
         usb_set_intfdata(intf, NULL);
 out:
         free_netdev(netdev);
@@ -5365,7 +5366,6 @@ static void rtl8152_disconnect(struct usb_interface *intf)
         if (tp) {
                 rtl_set_unplug(tp);
 
-                netif_napi_del(&tp->napi);
                 unregister_netdev(tp->netdev);
                 cancel_delayed_work_sync(&tp->hw_phy_work);
                 tp->rtl_ops.unload(tp);
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 4f3de0ac8b0b..ba98e0971b84 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1331,7 +1331,7 @@ static int virtnet_receive(struct receive_queue *rq, int budget,
                 }
         }
 
-        if (rq->vq->num_free > virtqueue_get_vring_size(rq->vq) / 2) {
+        if (rq->vq->num_free > min((unsigned int)budget, virtqueue_get_vring_size(rq->vq)) / 2) {
                 if (!try_fill_recv(vi, rq, GFP_ATOMIC))
                         schedule_delayed_work(&vi->refill, 0);
         }
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index e9fc168bb734..489cba9b284d 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -351,13 +351,15 @@ int i2400m_barker_db_init(const char *_options)
                         }
                         result = i2400m_barker_db_add(barker);
                         if (result < 0)
-                                goto error_add;
+                                goto error_parse_add;
                 }
                 kfree(options_orig);
         }
         return 0;
 
+error_parse_add:
 error_parse:
+        kfree(options_orig);
 error_add:
         kfree(i2400m_barker_db);
         return result;
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
index 1f500cddb3a7..55b713255b8e 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
@@ -556,6 +556,30 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0 = {
         .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
 };
 
+const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0 = {
+        .name = "Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)",
+        .fw_name_pre = IWL_QU_C_HR_B_FW_PRE,
+        IWL_DEVICE_22500,
+        /*
+         * This device doesn't support receiving BlockAck with a large bitmap
+         * so we need to restrict the size of transmitted aggregation to the
+         * HT size; mac80211 would otherwise pick the HE max (256) by default.
+         */
+        .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+};
+
+const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = {
+        .name = "Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)",
+        .fw_name_pre = IWL_QU_C_HR_B_FW_PRE,
+        IWL_DEVICE_22500,
+        /*
+         * This device doesn't support receiving BlockAck with a large bitmap
+         * so we need to restrict the size of transmitted aggregation to the
+         * HT size; mac80211 would otherwise pick the HE max (256) by default.
+         */
+        .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
+};
+
 const struct iwl_cfg iwl22000_2ax_cfg_jf = {
         .name = "Intel(R) Dual Band Wireless AX 22000",
         .fw_name_pre = IWL_QU_B_JF_B_FW_PRE,
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 1c1bf1b281cd..6c04f8223aff 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -577,6 +577,8 @@ extern const struct iwl_cfg iwl_ax1650i_cfg_quz_hr;
 extern const struct iwl_cfg iwl_ax1650s_cfg_quz_hr;
 extern const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0;
 extern const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0;
+extern const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0;
+extern const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0;
 extern const struct iwl_cfg killer1650x_2ax_cfg;
 extern const struct iwl_cfg killer1650w_2ax_cfg;
 extern const struct iwl_cfg iwl9461_2ac_cfg_qu_b0_jf_b0;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index cb22d447fcb8..fe776e35b9d0 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -554,7 +554,7 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm,
                 cpu_to_le32(vif->bss_conf.use_short_slot ?
                             MAC_FLG_SHORT_SLOT : 0);
 
-        cmd->filter_flags = cpu_to_le32(MAC_FILTER_ACCEPT_GRP);
+        cmd->filter_flags = 0;
 
         for (i = 0; i < IEEE80211_NUM_ACS; i++) {
                 u8 txf = iwl_mvm_mac_ac_to_tx_fifo(mvm, i);
@@ -623,6 +623,8 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,
         /* We need the dtim_period to set the MAC as associated */
         if (vif->bss_conf.assoc && vif->bss_conf.dtim_period &&
             !force_assoc_off) {
+                struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+                u8 ap_sta_id = mvmvif->ap_sta_id;
                 u32 dtim_offs;
 
                 /*
@@ -658,6 +660,29 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,
                                dtim_offs);
 
                 ctxt_sta->is_assoc = cpu_to_le32(1);
+
+                /*
+                 * allow multicast data frames only as long as the station is
+                 * authorized, i.e., GTK keys are already installed (if needed)
+                 */
+                if (ap_sta_id < IWL_MVM_STATION_COUNT) {
+                        struct ieee80211_sta *sta;
+
+                        rcu_read_lock();
+
+                        sta = rcu_dereference(mvm->fw_id_to_mac_id[ap_sta_id]);
+                        if (!IS_ERR_OR_NULL(sta)) {
+                                struct iwl_mvm_sta *mvmsta =
+                                        iwl_mvm_sta_from_mac80211(sta);
+
+                                if (mvmsta->sta_state ==
+                                    IEEE80211_STA_AUTHORIZED)
+                                        cmd.filter_flags |=
+                                                cpu_to_le32(MAC_FILTER_ACCEPT_GRP);
+                        }
+
+                        rcu_read_unlock();
+                }
         } else {
                 ctxt_sta->is_assoc = cpu_to_le32(0);
 
@@ -703,7 +728,8 @@ static int iwl_mvm_mac_ctxt_cmd_listener(struct iwl_mvm *mvm,
                                        MAC_FILTER_IN_CONTROL_AND_MGMT |
                                        MAC_FILTER_IN_BEACON |
                                        MAC_FILTER_IN_PROBE_REQUEST |
-                                       MAC_FILTER_IN_CRC32);
+                                       MAC_FILTER_IN_CRC32 |
+                                       MAC_FILTER_ACCEPT_GRP);
         ieee80211_hw_set(mvm->hw, RX_INCLUDES_FCS);
 
         /* Allocate sniffer station */
@@ -727,7 +753,8 @@ static int iwl_mvm_mac_ctxt_cmd_ibss(struct iwl_mvm *mvm,
         iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &cmd, NULL, action);
 
         cmd.filter_flags = cpu_to_le32(MAC_FILTER_IN_BEACON |
-                                       MAC_FILTER_IN_PROBE_REQUEST);
+                                       MAC_FILTER_IN_PROBE_REQUEST |
+                                       MAC_FILTER_ACCEPT_GRP);
 
         /* cmd.ibss.beacon_time/cmd.ibss.beacon_tsf are curently ignored */
         cmd.ibss.bi = cpu_to_le32(vif->bss_conf.beacon_int);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 1c904b5226aa..a7bc00d1296f 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -3327,10 +3327,20 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,
                 /* enable beacon filtering */
                 WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif, 0));
 
+                /*
+                 * Now that the station is authorized, i.e., keys were already
+                 * installed, need to indicate to the FW that
+                 * multicast data frames can be forwarded to the driver
+                 */
+                iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);
+
                 iwl_mvm_rs_rate_init(mvm, sta, mvmvif->phy_ctxt->channel->band,
                                      true);
         } else if (old_state == IEEE80211_STA_AUTHORIZED &&
                    new_state == IEEE80211_STA_ASSOC) {
+                /* Multicast data frames are no longer allowed */
+                iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);
+
                 /* disable beacon filtering */
                 ret = iwl_mvm_disable_beacon_filter(mvm, vif, 0);
                 WARN_ON(ret &&
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index de711c1160d3..d9ed53b7c768 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1062,7 +1062,28 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                         iwl_trans->cfg = &iwl9560_2ac_cfg_qu_c0_jf_b0;
                 else if (iwl_trans->cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)
                         iwl_trans->cfg = &iwl9560_2ac_160_cfg_qu_c0_jf_b0;
+                else if (iwl_trans->cfg == &killer1650s_2ax_cfg_qu_b0_hr_b0)
+                        iwl_trans->cfg = &killer1650s_2ax_cfg_qu_c0_hr_b0;
+                else if (iwl_trans->cfg == &killer1650i_2ax_cfg_qu_b0_hr_b0)
+                        iwl_trans->cfg = &killer1650i_2ax_cfg_qu_c0_hr_b0;
         }
+
+        /* same thing for QuZ... */
+        if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_QUZ) {
+                if (cfg == &iwl_ax101_cfg_qu_hr)
+                        cfg = &iwl_ax101_cfg_quz_hr;
+                else if (cfg == &iwl_ax201_cfg_qu_hr)
+                        cfg = &iwl_ax201_cfg_quz_hr;
+                else if (cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)
+                        cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc;
+                else if (cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)
+                        cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc;
+                else if (cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)
+                        cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc;
+                else if (cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)
+                        cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;
+        }
+
 #endif
 
         pci_set_drvdata(pdev, iwl_trans);
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index f5df5b370d78..db62c8314603 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3602,11 +3602,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
                 }
         } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
                    CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
-                   ((trans->cfg != &iwl_ax200_cfg_cc &&
-                     trans->cfg != &killer1650x_2ax_cfg &&
-                     trans->cfg != &killer1650w_2ax_cfg &&
-                     trans->cfg != &iwl_ax201_cfg_quz_hr) ||
-                    trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0)) {
+                   trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) {
                 u32 hw_status;
 
                 hw_status = iwl_read_prph(trans, UMAG_GEN_HW_STATUS);
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
index 38d110338987..9ef6b8fe03c1 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
@@ -99,10 +99,7 @@ void iwl_pcie_gen2_update_byte_tbl(struct iwl_trans_pcie *trans_pcie,
         u16 len = byte_cnt;
         __le16 bc_ent;
 
-        if (trans_pcie->bc_table_dword)
-                len = DIV_ROUND_UP(len, 4);
-
-        if (WARN_ON(len > 0xFFF || idx >= txq->n_window))
+        if (WARN(idx >= txq->n_window, "%d >= %d\n", idx, txq->n_window))
                 return;
 
         filled_tfd_size = offsetof(struct iwl_tfh_tfd, tbs) +
@@ -117,11 +114,20 @@ void iwl_pcie_gen2_update_byte_tbl(struct iwl_trans_pcie *trans_pcie,
          */
         num_fetch_chunks = DIV_ROUND_UP(filled_tfd_size, 64) - 1;
 
-        bc_ent = cpu_to_le16(len | (num_fetch_chunks << 12));
-        if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560)
+        if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560) {
+                /* Starting from 22560, the HW expects bytes */
+                WARN_ON(trans_pcie->bc_table_dword);
+                WARN_ON(len > 0x3FFF);
+                bc_ent = cpu_to_le16(len | (num_fetch_chunks << 14));
                 scd_bc_tbl_gen3->tfd_offset[idx] = bc_ent;
-        else
+        } else {
+                /* Until 22560, the HW expects DW */
+                WARN_ON(!trans_pcie->bc_table_dword);
+                len = DIV_ROUND_UP(len, 4);
+                WARN_ON(len > 0xFFF);
+                bc_ent = cpu_to_le16(len | (num_fetch_chunks << 12));
                 scd_bc_tbl->tfd_offset[idx] = bc_ent;
+        }
 }
 
 /*
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
index 627ed1fc7b15..645f4d15fb61 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
@@ -136,11 +136,11 @@ static const struct ieee80211_ops mt76x0u_ops = {
         .release_buffered_frames = mt76_release_buffered_frames,
 };
 
-static int mt76x0u_init_hardware(struct mt76x02_dev *dev)
+static int mt76x0u_init_hardware(struct mt76x02_dev *dev, bool reset)
 {
         int err;
 
-        mt76x0_chip_onoff(dev, true, true);
+        mt76x0_chip_onoff(dev, true, reset);
 
         if (!mt76x02_wait_for_mac(&dev->mt76))
                 return -ETIMEDOUT;
@@ -173,7 +173,7 @@ static int mt76x0u_register_device(struct mt76x02_dev *dev)
         if (err < 0)
                 goto out_err;
 
-        err = mt76x0u_init_hardware(dev);
+        err = mt76x0u_init_hardware(dev, true);
         if (err < 0)
                 goto out_err;
 
@@ -309,7 +309,7 @@ static int __maybe_unused mt76x0_resume(struct usb_interface *usb_intf)
         if (ret < 0)
                 goto err;
 
-        ret = mt76x0u_init_hardware(dev);
+        ret = mt76x0u_init_hardware(dev, false);
         if (ret)
                 goto err;
 
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index c9b957ac5733..ecbe78b8027b 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -6095,6 +6095,15 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
         }
 
         /*
+         * Clear encryption initialization vectors on start, but keep them
+         * for watchdog reset. Otherwise we will have wrong IVs and not be
+         * able to keep connections after reset.
+         */
+        if (!test_bit(DEVICE_STATE_RESET, &rt2x00dev->flags))
+                for (i = 0; i < 256; i++)
+                        rt2800_register_write(rt2x00dev, MAC_IVEIV_ENTRY(i), 0);
+
+        /*
          * Clear all beacons
          */
         for (i = 0; i < 8; i++)
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
index 7e43690a861c..2b216edd0c7d 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
@@ -658,6 +658,7 @@ enum rt2x00_state_flags {
         DEVICE_STATE_ENABLED_RADIO,
         DEVICE_STATE_SCANNING,
         DEVICE_STATE_FLUSHING,
+        DEVICE_STATE_RESET,
 
         /*
          * Driver configuration
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
index 35414f97a978..9d158237ac67 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
@@ -1256,13 +1256,14 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)
 
 int rt2x00lib_start(struct rt2x00_dev *rt2x00dev)
 {
-        int retval;
+        int retval = 0;
 
         if (test_bit(DEVICE_STATE_STARTED, &rt2x00dev->flags)) {
                 /*
                  * This is special case for ieee80211_restart_hw(), otherwise
                  * mac80211 never call start() two times in row without stop();
                  */
+                set_bit(DEVICE_STATE_RESET, &rt2x00dev->flags);
                 rt2x00dev->ops->lib->pre_reset_hw(rt2x00dev);
                 rt2x00lib_stop(rt2x00dev);
         }
@@ -1273,14 +1274,14 @@ int rt2x00lib_start(struct rt2x00_dev *rt2x00dev)
          */
         retval = rt2x00lib_load_firmware(rt2x00dev);
         if (retval)
-                return retval;
+                goto out;
 
         /*
          * Initialize the device.
          */
         retval = rt2x00lib_initialize(rt2x00dev);
         if (retval)
-                return retval;
+                goto out;
 
         rt2x00dev->intf_ap_count = 0;
         rt2x00dev->intf_sta_count = 0;
@@ -1289,11 +1290,13 @@ int rt2x00lib_start(struct rt2x00_dev *rt2x00dev)
         /* Enable the radio */
         retval = rt2x00lib_enable_radio(rt2x00dev);
         if (retval)
-                return retval;
+                goto out;
 
         set_bit(DEVICE_STATE_STARTED, &rt2x00dev->flags);
 
-        return 0;
+out:
+        clear_bit(DEVICE_STATE_RESET, &rt2x00dev->flags);
+        return retval;
 }
 
 void rt2x00lib_stop(struct rt2x00_dev *rt2x00dev)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 1d9940d4e8c7..c9262ffeefe4 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -925,6 +925,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue,
                         skb_shinfo(skb)->nr_frags = MAX_SKB_FRAGS;
                         nskb = xenvif_alloc_skb(0);
                         if (unlikely(nskb == NULL)) {
+                                skb_shinfo(skb)->nr_frags = 0;
                                 kfree_skb(skb);
                                 xenvif_tx_err(queue, &txreq, extra_count, idx);
                                 if (net_ratelimit())
@@ -940,6 +941,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue,
 
                         if (xenvif_set_skb_gso(queue->vif, skb, gso)) {
                                 /* Failure in xenvif_set_skb_gso is fatal. */
+                                skb_shinfo(skb)->nr_frags = 0;
                                 kfree_skb(skb);
                                 kfree_skb(nskb);
                                 break;
diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c
index 3e7b11cf1aae..cb98b8fe786e 100644
--- a/drivers/nvdimm/pfn_devs.c
+++ b/drivers/nvdimm/pfn_devs.c
@@ -655,6 +655,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)
         resource_size_t start, size;
         struct nd_region *nd_region;
         unsigned long npfns, align;
+        u32 end_trunc;
         struct nd_pfn_sb *pfn_sb;
         phys_addr_t offset;
         const char *sig;
@@ -696,6 +697,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)
         size = resource_size(&nsio->res);
         npfns = PHYS_PFN(size - SZ_8K);
         align = max(nd_pfn->align, (1UL << SUBSECTION_SHIFT));
+        end_trunc = start + size - ALIGN_DOWN(start + size, align);
         if (nd_pfn->mode == PFN_MODE_PMEM) {
                 /*
                  * The altmap should be padded out to the block size used
@@ -714,7 +716,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)
                 return -ENXIO;
         }
 
-        npfns = PHYS_PFN(size - offset);
+        npfns = PHYS_PFN(size - offset - end_trunc);
         pfn_sb->mode = cpu_to_le32(nd_pfn->mode);
         pfn_sb->dataoff = cpu_to_le64(offset);
         pfn_sb->npfns = cpu_to_le64(npfns);
@@ -723,6 +725,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)
         memcpy(pfn_sb->parent_uuid, nd_dev_to_uuid(&ndns->dev), 16);
         pfn_sb->version_major = cpu_to_le16(1);
         pfn_sb->version_minor = cpu_to_le16(3);
+        pfn_sb->end_trunc = cpu_to_le32(end_trunc);
         pfn_sb->align = cpu_to_le32(nd_pfn->align);
         checksum = nd_sb_checksum((struct nd_gen_sb *) pfn_sb);
         pfn_sb->checksum = cpu_to_le64(checksum);
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index c258a1ce4b28..d3d6b7bd6903 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2257,6 +2257,16 @@ static const struct nvme_core_quirk_entry core_quirks[] = {
                 .vid = 0x1179,
                 .mn = "THNSF5256GPUK TOSHIBA",
                 .quirks = NVME_QUIRK_NO_APST,
+        },
+        {
+                /*
+                 * This LiteON CL1-3D*-Q11 firmware version has a race
+                 * condition associated with actions related to suspend to idle
+                 * LiteON has resolved the problem in future firmware
+                 */
+                .vid = 0x14a4,
+                .fr = "22301111",
+                .quirks = NVME_QUIRK_SIMPLE_SUSPEND,
         }
 };
 
@@ -2597,6 +2607,9 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
                         goto out_free;
         }
 
+        if (!(ctrl->ops->flags & NVME_F_FABRICS))
+                ctrl->cntlid = le16_to_cpu(id->cntlid);
+
         if (!ctrl->identified) {
                 int i;
 
@@ -2697,7 +2710,6 @@ int nvme_init_identify(struct nvme_ctrl *ctrl)
                         goto out_free;
                 }
         } else {
-                ctrl->cntlid = le16_to_cpu(id->cntlid);
                 ctrl->hmpre = le32_to_cpu(id->hmpre);
                 ctrl->hmmin = le32_to_cpu(id->hmmin);
                 ctrl->hmminds = le32_to_cpu(id->hmminds);
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 888d4543894e..af831d3d15d0 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -428,6 +428,7 @@ static void nvme_mpath_set_live(struct nvme_ns *ns)
                 srcu_read_unlock(&head->srcu, srcu_idx);
         }
 
+        synchronize_srcu(&ns->head->srcu);
         kblockd_schedule_work(&ns->head->requeue_work);
 }
 
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 778b3a0b6adb..2d678fb968c7 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -92,6 +92,11 @@ enum nvme_quirks {
          * Broken Write Zeroes.
          */
         NVME_QUIRK_DISABLE_WRITE_ZEROES         = (1 << 9),
+
+        /*
+         * Force simple suspend/resume path.
+         */
+        NVME_QUIRK_SIMPLE_SUSPEND               = (1 << 10),
 };
 
 /*
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 6bd9b1033965..732d5b63ec05 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2876,7 +2876,8 @@ static int nvme_suspend(struct device *dev)
          * state (which may not be possible if the link is up).
          */
         if (pm_suspend_via_firmware() || !ctrl->npss ||
-            !pcie_aspm_enabled(pdev)) {
+            !pcie_aspm_enabled(pdev) ||
+            (ndev->ctrl.quirks & NVME_QUIRK_SIMPLE_SUSPEND)) {
                 nvme_dev_disable(ndev, true);
                 return 0;
         }
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 208aacf39329..44c4ae1abd00 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -5256,7 +5256,7 @@ static void quirk_reset_lenovo_thinkpad_p50_nvgpu(struct pci_dev *pdev)
          */
         if (ioread32(map + 0x2240c) & 0x2) {
                 pci_info(pdev, FW_BUG "GPU left initialized by EFI, resetting\n");
-                ret = pci_reset_function(pdev);
+                ret = pci_reset_bus(pdev);
                 if (ret < 0)
                         pci_err(pdev, "Failed to reset GPU: %d\n", ret);
         }
diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chrome/cros_ec_ishtp.c
index e504d255d5ce..430731cdf827 100644
--- a/drivers/platform/chrome/cros_ec_ishtp.c
+++ b/drivers/platform/chrome/cros_ec_ishtp.c
@@ -707,7 +707,7 @@ static int cros_ec_ishtp_reset(struct ishtp_cl_device *cl_device)
  */
 static int __maybe_unused cros_ec_ishtp_suspend(struct device *device)
 {
-        struct ishtp_cl_device *cl_device = dev_get_drvdata(device);
+        struct ishtp_cl_device *cl_device = ishtp_dev_to_cl_device(device);
         struct ishtp_cl *cros_ish_cl = ishtp_get_drvdata(cl_device);
         struct ishtp_cl_data *client_data = ishtp_get_client_data(cros_ish_cl);
 
@@ -722,7 +722,7 @@ static int __maybe_unused cros_ec_ishtp_suspend(struct device *device)
  */
 static int __maybe_unused cros_ec_ishtp_resume(struct device *device)
 {
-        struct ishtp_cl_device *cl_device = dev_get_drvdata(device);
+        struct ishtp_cl_device *cl_device = ishtp_dev_to_cl_device(device);
         struct ishtp_cl *cros_ish_cl = ishtp_get_drvdata(cl_device);
         struct ishtp_cl_data *client_data = ishtp_get_client_data(cros_ish_cl);
 
diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c
index 30de448de802..86d88aec94a1 100644
--- a/drivers/power/supply/ab8500_charger.c
+++ b/drivers/power/supply/ab8500_charger.c
@@ -742,6 +742,7 @@ static int ab8500_charger_max_usb_curr(struct ab8500_charger *di,
                                                 USB_CH_IP_CUR_LVL_1P5;
                         break;
                 }
+                /* Else, fall through */
         case USB_STAT_HM_IDGND:
                 dev_err(di->dev, "USB Type - Charging not allowed\n");
                 di->max_usb_in_curr.usb_type_max = USB_CH_IP_CUR_LVL_0P05;
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index c7ee07ce3615..28db887d38ed 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -629,6 +629,7 @@ struct qeth_seqno {
 struct qeth_reply {
         struct list_head list;
         struct completion received;
+        spinlock_t lock;
         int (*callback)(struct qeth_card *, struct qeth_reply *,
                 unsigned long);
         u32 seqno;
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 4d0caeebc802..6502b148541e 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -544,6 +544,7 @@ static struct qeth_reply *qeth_alloc_reply(struct qeth_card *card)
         if (reply) {
                 refcount_set(&reply->refcnt, 1);
                 init_completion(&reply->received);
+                spin_lock_init(&reply->lock);
         }
         return reply;
 }
@@ -799,6 +800,13 @@ static void qeth_issue_next_read_cb(struct qeth_card *card,
 
         if (!reply->callback) {
                 rc = 0;
+                goto no_callback;
+        }
+
+        spin_lock_irqsave(&reply->lock, flags);
+        if (reply->rc) {
+                /* Bail out when the requestor has already left: */
+                rc = reply->rc;
         } else {
                 if (cmd) {
                         reply->offset = (u16)((char *)cmd - (char *)iob->data);
@@ -807,7 +815,9 @@ static void qeth_issue_next_read_cb(struct qeth_card *card,
                         rc = reply->callback(card, reply, (unsigned long)iob);
                 }
         }
+        spin_unlock_irqrestore(&reply->lock, flags);
 
+no_callback:
         if (rc <= 0)
                 qeth_notify_reply(reply, rc);
         qeth_put_reply(reply);
@@ -1749,6 +1759,16 @@ static int qeth_send_control_data(struct qeth_card *card,
                 rc = (timeout == -ERESTARTSYS) ? -EINTR : -ETIME;
 
         qeth_dequeue_reply(card, reply);
+
+        if (reply_cb) {
+                /* Wait until the callback for a late reply has completed: */
+                spin_lock_irq(&reply->lock);
+                if (rc)
+                        /* Zap any callback that's still pending: */
+                        reply->rc = rc;
+                spin_unlock_irq(&reply->lock);
+        }
+
         if (!rc)
                 rc = reply->rc;
         qeth_put_reply(reply);
@@ -4354,6 +4374,10 @@ static int qeth_snmp_command(struct qeth_card *card, char __user *udata)
             get_user(req_len, &ureq->hdr.req_len))
                 return -EFAULT;
 
+        /* Sanitize user input, to avoid overflows in iob size calculation: */
+        if (req_len > QETH_BUFSIZE)
+                return -EINVAL;
+
         iob = qeth_get_adapter_cmd(card, IPA_SETADP_SET_SNMP_CONTROL, req_len);
         if (!iob)
                 return -ENOMEM;
diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index abcad097ff2f..f47b4b281b14 100644
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -459,6 +459,7 @@ static void sas_discover_domain(struct work_struct *work)
                 pr_notice("ATA device seen but CONFIG_SCSI_SAS_ATA=N so cannot attach\n");
                 /* Fall through */
 #endif
+                /* Fall through - only for the #else condition above. */
         default:
                 error = -ENXIO;
                 pr_err("unhandled device %d\n", dev->dev_type);
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 2c3bb8a966e5..bade2e025ecf 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -824,6 +824,7 @@ struct lpfc_hba {
         uint32_t cfg_cq_poll_threshold;
         uint32_t cfg_cq_max_proc_limit;
         uint32_t cfg_fcp_cpu_map;
+        uint32_t cfg_fcp_mq_threshold;
         uint32_t cfg_hdw_queue;
         uint32_t cfg_irq_chann;
         uint32_t cfg_suppress_rsp;
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index ea62322ffe2b..d65558619ab0 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -5709,6 +5709,19 @@ LPFC_ATTR_RW(nvme_embed_cmd, 1, 0, 2,
              "Embed NVME Command in WQE");
 
 /*
+ * lpfc_fcp_mq_threshold: Set the maximum number of Hardware Queues
+ * the driver will advertise it supports to the SCSI layer.
+ *
+ *      0    = Set nr_hw_queues by the number of CPUs or HW queues.
+ *      1,128 = Manually specify the maximum nr_hw_queue value to be set,
+ *
+ * Value range is [0,256]. Default value is 8.
+ */
+LPFC_ATTR_R(fcp_mq_threshold, LPFC_FCP_MQ_THRESHOLD_DEF,
+            LPFC_FCP_MQ_THRESHOLD_MIN, LPFC_FCP_MQ_THRESHOLD_MAX,
+            "Set the number of SCSI Queues advertised");
+
+/*
  * lpfc_hdw_queue: Set the number of Hardware Queues the driver
  * will advertise it supports to the NVME and  SCSI layers. This also
  * will map to the number of CQ/WQ pairs the driver will create.
@@ -6030,6 +6043,7 @@ struct device_attribute *lpfc_hba_attrs[] = {
         &dev_attr_lpfc_cq_poll_threshold,
         &dev_attr_lpfc_cq_max_proc_limit,
         &dev_attr_lpfc_fcp_cpu_map,
+        &dev_attr_lpfc_fcp_mq_threshold,
         &dev_attr_lpfc_hdw_queue,
         &dev_attr_lpfc_irq_chann,
         &dev_attr_lpfc_suppress_rsp,
@@ -7112,6 +7126,7 @@ lpfc_get_cfgparam(struct lpfc_hba *phba)
         /* Initialize first burst. Target vs Initiator are different. */
         lpfc_nvme_enable_fb_init(phba, lpfc_nvme_enable_fb);
         lpfc_nvmet_fb_size_init(phba, lpfc_nvmet_fb_size);
+        lpfc_fcp_mq_threshold_init(phba, lpfc_fcp_mq_threshold);
         lpfc_hdw_queue_init(phba, lpfc_hdw_queue);
         lpfc_irq_chann_init(phba, lpfc_irq_chann);
         lpfc_enable_bbcr_init(phba, lpfc_enable_bbcr);
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index a7549ae32542..1ac98becb5ba 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -4309,10 +4309,12 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)
         shost->max_cmd_len = 16;
 
         if (phba->sli_rev == LPFC_SLI_REV4) {
-                if (phba->cfg_fcp_io_sched == LPFC_FCP_SCHED_BY_HDWQ)
-                        shost->nr_hw_queues = phba->cfg_hdw_queue;
-                else
-                        shost->nr_hw_queues = phba->sli4_hba.num_present_cpu;
+                if (!phba->cfg_fcp_mq_threshold ||
+                    phba->cfg_fcp_mq_threshold > phba->cfg_hdw_queue)
+                        phba->cfg_fcp_mq_threshold = phba->cfg_hdw_queue;
+
+                shost->nr_hw_queues = min_t(int, 2 * num_possible_nodes(),
+                                            phba->cfg_fcp_mq_threshold);
 
                 shost->dma_boundary =
                         phba->sli4_hba.pc_sli4_params.sge_supp_len-1;
diff --git a/drivers/scsi/lpfc/lpfc_sli4.h b/drivers/scsi/lpfc/lpfc_sli4.h
index 3aeca387b22a..a81ef0293696 100644
--- a/drivers/scsi/lpfc/lpfc_sli4.h
+++ b/drivers/scsi/lpfc/lpfc_sli4.h
@@ -44,6 +44,11 @@
 #define LPFC_HBA_HDWQ_MAX       128
 #define LPFC_HBA_HDWQ_DEF       0
 
+/* FCP MQ queue count limiting */
+#define LPFC_FCP_MQ_THRESHOLD_MIN       0
+#define LPFC_FCP_MQ_THRESHOLD_MAX       256
+#define LPFC_FCP_MQ_THRESHOLD_DEF       8
+
 /* Common buffer size to accomidate SCSI and NVME IO buffers */
 #define LPFC_COMMON_IO_BUF_SZ   768
 
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 8d560c562e9c..6b7b390b2e52 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -2956,6 +2956,8 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
         dma_free_coherent(&ha->pdev->dev, vha->gnl.size, vha->gnl.l,
             vha->gnl.ldma);
 
+        vha->gnl.l = NULL;
+
         vfree(vha->scan.l);
 
         if (vha->qpair && vha->qpair->vp_idx == vha->vp_idx) {
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 2e58cff9d200..98e60a34afd9 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3440,6 +3440,12 @@ skip_dpc:
         return 0;
 
 probe_failed:
+        if (base_vha->gnl.l) {
+                dma_free_coherent(&ha->pdev->dev, base_vha->gnl.size,
+                                base_vha->gnl.l, base_vha->gnl.ldma);
+                base_vha->gnl.l = NULL;
+        }
+
         if (base_vha->timer_active)
                 qla2x00_stop_timer(base_vha);
         base_vha->flags.online = 0;
@@ -3673,7 +3679,7 @@ qla2x00_remove_one(struct pci_dev *pdev)
         if (!atomic_read(&pdev->enable_cnt)) {
                 dma_free_coherent(&ha->pdev->dev, base_vha->gnl.size,
                     base_vha->gnl.l, base_vha->gnl.ldma);
-
+                base_vha->gnl.l = NULL;
                 scsi_host_put(base_vha->host);
                 kfree(ha);
                 pci_set_drvdata(pdev, NULL);
@@ -3713,6 +3719,8 @@ qla2x00_remove_one(struct pci_dev *pdev)
         dma_free_coherent(&ha->pdev->dev,
                 base_vha->gnl.size, base_vha->gnl.l, base_vha->gnl.ldma);
 
+        base_vha->gnl.l = NULL;
+
         vfree(base_vha->scan.l);
 
         if (IS_QLAFX00(ha))
@@ -4816,6 +4824,7 @@ struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *sht,
                     "Alloc failed for scan database.\n");
                 dma_free_coherent(&ha->pdev->dev, vha->gnl.size,
                     vha->gnl.l, vha->gnl.ldma);
+                vha->gnl.l = NULL;
                 scsi_remove_host(vha->host);
                 return NULL;
         }
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index e274053109d0..029da74bb2f5 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -7062,6 +7062,9 @@ static inline int ufshcd_config_vreg_lpm(struct ufs_hba *hba,
 static inline int ufshcd_config_vreg_hpm(struct ufs_hba *hba,
                                          struct ufs_vreg *vreg)
 {
+        if (!vreg)
+                return 0;
+
         return ufshcd_config_vreg_load(hba->dev, vreg, vreg->max_uA);
 }
 
diff --git a/drivers/soc/ixp4xx/Kconfig b/drivers/soc/ixp4xx/Kconfig
index de2e62c3310a..e3eb19b85fa4 100644
--- a/drivers/soc/ixp4xx/Kconfig
+++ b/drivers/soc/ixp4xx/Kconfig
@@ -1,4 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
+if ARCH_IXP4XX || COMPILE_TEST
+
 menu "IXP4xx SoC drivers"
 
 config IXP4XX_QMGR
@@ -15,3 +17,5 @@ config IXP4XX_NPE
           and is automatically selected by Ethernet and HSS drivers.
 
 endmenu
+
+endif
diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c
index d5cf953b4337..7d622ea1274e 100644
--- a/drivers/soc/qcom/qcom-geni-se.c
+++ b/drivers/soc/qcom/qcom-geni-se.c
@@ -630,6 +630,9 @@ int geni_se_tx_dma_prep(struct geni_se *se, void *buf, size_t len,
         struct geni_wrapper *wrapper = se->wrapper;
         u32 val;
 
+        if (!wrapper)
+                return -EINVAL;
+
         *iova = dma_map_single(wrapper->dev, buf, len, DMA_TO_DEVICE);
         if (dma_mapping_error(wrapper->dev, *iova))
                 return -EIO;
@@ -663,6 +666,9 @@ int geni_se_rx_dma_prep(struct geni_se *se, void *buf, size_t len,
         struct geni_wrapper *wrapper = se->wrapper;
         u32 val;
 
+        if (!wrapper)
+                return -EINVAL;
+
         *iova = dma_map_single(wrapper->dev, buf, len, DMA_FROM_DEVICE);
         if (dma_mapping_error(wrapper->dev, *iova))
                 return -EIO;
diff --git a/drivers/soc/ti/pm33xx.c b/drivers/soc/ti/pm33xx.c
index bb77c220b6f8..ccc6d53fe788 100644
--- a/drivers/soc/ti/pm33xx.c
+++ b/drivers/soc/ti/pm33xx.c
@@ -141,7 +141,7 @@ static int __init am43xx_map_gic(void)
 }
 
 #ifdef CONFIG_SUSPEND
-struct wkup_m3_wakeup_src rtc_wake_src(void)
+static struct wkup_m3_wakeup_src rtc_wake_src(void)
 {
         u32 i;
 
@@ -157,7 +157,7 @@ struct wkup_m3_wakeup_src rtc_wake_src(void)
         return rtc_ext_wakeup;
 }
 
-int am33xx_rtc_only_idle(unsigned long wfi_flags)
+static int am33xx_rtc_only_idle(unsigned long wfi_flags)
 {
         omap_rtc_power_off_program(&omap_rtc->dev);
         am33xx_do_wfi_sram(wfi_flags);
@@ -252,7 +252,7 @@ static int am33xx_pm_begin(suspend_state_t state)
         if (state == PM_SUSPEND_MEM && pm_ops->check_off_mode_enable()) {
                 nvmem = devm_nvmem_device_get(&omap_rtc->dev,
                                               "omap_rtc_scratch0");
-                if (nvmem)
+                if (!IS_ERR(nvmem))
                         nvmem_device_write(nvmem, RTC_SCRATCH_MAGIC_REG * 4, 4,
                                            (void *)&rtc_magic_val);
                 rtc_only_idle = 1;
@@ -278,9 +278,12 @@ static void am33xx_pm_end(void)
         struct nvmem_device *nvmem;
 
         nvmem = devm_nvmem_device_get(&omap_rtc->dev, "omap_rtc_scratch0");
+        if (IS_ERR(nvmem))
+                return;
+
         m3_ipc->ops->finish_low_power(m3_ipc);
         if (rtc_only_idle) {
-                if (retrigger_irq)
+                if (retrigger_irq) {
                         /*
                          * 32 bits of Interrupt Set-Pending correspond to 32
                          * 32 interrupts. Compute the bit offset of the
@@ -291,8 +294,10 @@ static void am33xx_pm_end(void)
                         writel_relaxed(1 << (retrigger_irq & 31),
                                        gic_dist_base + GIC_INT_SET_PENDING_BASE
                                        + retrigger_irq / 32 * 4);
-                        nvmem_device_write(nvmem, RTC_SCRATCH_MAGIC_REG * 4, 4,
-                                           (void *)&val);
+                }
+
+                nvmem_device_write(nvmem, RTC_SCRATCH_MAGIC_REG * 4, 4,
+                                   (void *)&val);
         }
 
         rtc_only_idle = 0;
@@ -415,7 +420,7 @@ static int am33xx_pm_rtc_setup(void)
 
                 nvmem = devm_nvmem_device_get(&omap_rtc->dev,
                                               "omap_rtc_scratch0");
-                if (nvmem) {
+                if (!IS_ERR(nvmem)) {
                         nvmem_device_read(nvmem, RTC_SCRATCH_MAGIC_REG * 4,
                                           4, (void *)&rtc_magic_val);
                         if ((rtc_magic_val & 0xffff) != RTC_REG_BOOT_MAGIC)
diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 04eda111920e..661bb9358364 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -1132,14 +1132,16 @@ static void tcmu_handle_completion(struct tcmu_cmd *cmd, struct tcmu_cmd_entry *
         struct se_cmd *se_cmd = cmd->se_cmd;
         struct tcmu_dev *udev = cmd->tcmu_dev;
         bool read_len_valid = false;
-        uint32_t read_len = se_cmd->data_length;
+        uint32_t read_len;
 
         /*
          * cmd has been completed already from timeout, just reclaim
          * data area space and free cmd
          */
-        if (test_bit(TCMU_CMD_BIT_EXPIRED, &cmd->flags))
+        if (test_bit(TCMU_CMD_BIT_EXPIRED, &cmd->flags)) {
+                WARN_ON_ONCE(se_cmd);
                 goto out;
+        }
 
         list_del_init(&cmd->queue_entry);
 
@@ -1152,6 +1154,7 @@ static void tcmu_handle_completion(struct tcmu_cmd *cmd, struct tcmu_cmd_entry *
                 goto done;
         }
 
+        read_len = se_cmd->data_length;
         if (se_cmd->data_direction == DMA_FROM_DEVICE &&
             (entry->hdr.uflags & TCMU_UFLAG_READ_LEN) && entry->rsp.read_len) {
                 read_len_valid = true;
@@ -1307,6 +1310,7 @@ static int tcmu_check_expired_cmd(int id, void *p, void *data)
                  */
                 scsi_status = SAM_STAT_CHECK_CONDITION;
                 list_del_init(&cmd->queue_entry);
+                cmd->se_cmd = NULL;
         } else {
                 list_del_init(&cmd->queue_entry);
                 idr_remove(&udev->commands, id);
@@ -2022,6 +2026,7 @@ static void tcmu_reset_ring(struct tcmu_dev *udev, u8 err_level)
 
                 idr_remove(&udev->commands, i);
                 if (!test_bit(TCMU_CMD_BIT_EXPIRED, &cmd->flags)) {
+                        WARN_ON(!cmd->se_cmd);
                         list_del_init(&cmd->queue_entry);
                         if (err_level == 1) {
                                 /*
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 6a5ee8e6da10..67ad40b0a05b 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -709,12 +709,6 @@ static int _gadget_stop_activity(struct usb_gadget *gadget)
         struct ci_hdrc    *ci = container_of(gadget, struct ci_hdrc, gadget);
         unsigned long flags;
 
-        spin_lock_irqsave(&ci->lock, flags);
-        ci->gadget.speed = USB_SPEED_UNKNOWN;
-        ci->remote_wakeup = 0;
-        ci->suspended = 0;
-        spin_unlock_irqrestore(&ci->lock, flags);
-
         /* flush all endpoints */
         gadget_for_each_ep(ep, gadget) {
                 usb_ep_fifo_flush(ep);
@@ -732,6 +726,12 @@ static int _gadget_stop_activity(struct usb_gadget *gadget)
                 ci->status = NULL;
         }
 
+        spin_lock_irqsave(&ci->lock, flags);
+        ci->gadget.speed = USB_SPEED_UNKNOWN;
+        ci->remote_wakeup = 0;
+        ci->suspended = 0;
+        spin_unlock_irqrestore(&ci->lock, flags);
+
         return 0;
 }
 
@@ -1303,6 +1303,10 @@ static int ep_disable(struct usb_ep *ep)
                 return -EBUSY;
 
         spin_lock_irqsave(hwep->lock, flags);
+        if (hwep->ci->gadget.speed == USB_SPEED_UNKNOWN) {
+                spin_unlock_irqrestore(hwep->lock, flags);
+                return 0;
+        }
 
         /* only internal SW should disable ctrl endpts */
 
@@ -1392,6 +1396,10 @@ static int ep_queue(struct usb_ep *ep, struct usb_request *req,
                 return -EINVAL;
 
         spin_lock_irqsave(hwep->lock, flags);
+        if (hwep->ci->gadget.speed == USB_SPEED_UNKNOWN) {
+                spin_unlock_irqrestore(hwep->lock, flags);
+                return 0;
+        }
         retval = _ep_queue(ep, req, gfp_flags);
         spin_unlock_irqrestore(hwep->lock, flags);
         return retval;
@@ -1415,8 +1423,8 @@ static int ep_dequeue(struct usb_ep *ep, struct usb_request *req)
                 return -EINVAL;
 
         spin_lock_irqsave(hwep->lock, flags);
-
-        hw_ep_flush(hwep->ci, hwep->num, hwep->dir);
+        if (hwep->ci->gadget.speed != USB_SPEED_UNKNOWN)
+                hw_ep_flush(hwep->ci, hwep->num, hwep->dir);
 
         list_for_each_entry_safe(node, tmpnode, &hwreq->tds, td) {
                 dma_pool_free(hwep->td_pool, node->ptr, node->dma);
@@ -1487,6 +1495,10 @@ static void ep_fifo_flush(struct usb_ep *ep)
         }
 
         spin_lock_irqsave(hwep->lock, flags);
+        if (hwep->ci->gadget.speed == USB_SPEED_UNKNOWN) {
+                spin_unlock_irqrestore(hwep->lock, flags);
+                return;
+        }
 
         hw_ep_flush(hwep->ci, hwep->num, hwep->dir);
 
@@ -1559,6 +1571,10 @@ static int ci_udc_wakeup(struct usb_gadget *_gadget)
         int ret = 0;
 
         spin_lock_irqsave(&ci->lock, flags);
+        if (ci->gadget.speed == USB_SPEED_UNKNOWN) {
+                spin_unlock_irqrestore(&ci->lock, flags);
+                return 0;
+        }
         if (!ci->remote_wakeup) {
                 ret = -EOPNOTSUPP;
                 goto out;
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index a7824a51f86d..70afb2ca1eab 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -587,10 +587,20 @@ static int wdm_flush(struct file *file, fl_owner_t id)
 {
         struct wdm_device *desc = file->private_data;
 
-        wait_event(desc->wait, !test_bit(WDM_IN_USE, &desc->flags));
+        wait_event(desc->wait,
+                        /*
+                         * needs both flags. We cannot do with one
+                         * because resetting it would cause a race
+                         * with write() yet we need to signal
+                         * a disconnect
+                         */
+                        !test_bit(WDM_IN_USE, &desc->flags) ||
+                        test_bit(WDM_DISCONNECTING, &desc->flags));
 
         /* cannot dereference desc->intf if WDM_DISCONNECTING */
-        if (desc->werr < 0 && !test_bit(WDM_DISCONNECTING, &desc->flags))
+        if (test_bit(WDM_DISCONNECTING, &desc->flags))
+                return -ENODEV;
+        if (desc->werr < 0)
                 dev_err(&desc->intf->dev, "Error in flush path: %d\n",
                         desc->werr);
 
@@ -974,8 +984,6 @@ static void wdm_disconnect(struct usb_interface *intf)
         spin_lock_irqsave(&desc->iuspin, flags);
         set_bit(WDM_DISCONNECTING, &desc->flags);
         set_bit(WDM_READ, &desc->flags);
-        /* to terminate pending flushes */
-        clear_bit(WDM_IN_USE, &desc->flags);
         spin_unlock_irqrestore(&desc->iuspin, flags);
         wake_up_all(&desc->wait);
         mutex_lock(&desc->rlock);
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 4942122b2346..36858ddd8d9b 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -2362,8 +2362,11 @@ static int usbtmc_probe(struct usb_interface *intf,
                 goto err_put;
         }
 
+        retcode = -EINVAL;
         data->bulk_in = bulk_in->bEndpointAddress;
         data->wMaxPacketSize = usb_endpoint_maxp(bulk_in);
+        if (!data->wMaxPacketSize)
+                goto err_put;
         dev_dbg(&intf->dev, "Found bulk in endpoint at %u\n", data->bulk_in);
 
         data->bulk_out = bulk_out->bEndpointAddress;
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index 03432467b05f..7537681355f6 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -216,17 +216,18 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 /* EHCI, OHCI */
                 hcd->rsrc_start = pci_resource_start(dev, 0);
                 hcd->rsrc_len = pci_resource_len(dev, 0);
-                if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
-                                driver->description)) {
+                if (!devm_request_mem_region(&dev->dev, hcd->rsrc_start,
+                                hcd->rsrc_len, driver->description)) {
                         dev_dbg(&dev->dev, "controller already in use\n");
                         retval = -EBUSY;
                         goto put_hcd;
                 }
-                hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
+                hcd->regs = devm_ioremap_nocache(&dev->dev, hcd->rsrc_start,
+                                hcd->rsrc_len);
                 if (hcd->regs == NULL) {
                         dev_dbg(&dev->dev, "error mapping memory\n");
                         retval = -EFAULT;
-                        goto release_mem_region;
+                        goto put_hcd;
                 }
 
         } else {
@@ -240,8 +241,8 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
                         hcd->rsrc_start = pci_resource_start(dev, region);
                         hcd->rsrc_len = pci_resource_len(dev, region);
-                        if (request_region(hcd->rsrc_start, hcd->rsrc_len,
-                                        driver->description))
+                        if (devm_request_region(&dev->dev, hcd->rsrc_start,
+                                        hcd->rsrc_len, driver->description))
                                 break;
                 }
                 if (region == PCI_ROM_RESOURCE) {
@@ -275,20 +276,13 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
         }
 
         if (retval != 0)
-                goto unmap_registers;
+                goto put_hcd;
         device_wakeup_enable(hcd->self.controller);
 
         if (pci_dev_run_wake(dev))
                 pm_runtime_put_noidle(&dev->dev);
         return retval;
 
-unmap_registers:
-        if (driver->flags & HCD_MEMORY) {
-                iounmap(hcd->regs);
-release_mem_region:
-                release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-        } else
-                release_region(hcd->rsrc_start, hcd->rsrc_len);
 put_hcd:
         usb_put_hcd(hcd);
 disable_pci:
@@ -347,14 +341,6 @@ void usb_hcd_pci_remove(struct pci_dev *dev)
                 dev_set_drvdata(&dev->dev, NULL);
                 up_read(&companions_rwsem);
         }
-
-        if (hcd->driver->flags & HCD_MEMORY) {
-                iounmap(hcd->regs);
-                release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-        } else {
-                release_region(hcd->rsrc_start, hcd->rsrc_len);
-        }
-
         usb_put_hcd(hcd);
         pci_disable_device(dev);
 }
diff --git a/drivers/usb/gadget/udc/lpc32xx_udc.c b/drivers/usb/gadget/udc/lpc32xx_udc.c
index 5f1b14f3e5a0..bb6af6b5ac97 100644
--- a/drivers/usb/gadget/udc/lpc32xx_udc.c
+++ b/drivers/usb/gadget/udc/lpc32xx_udc.c
@@ -2265,7 +2265,7 @@ static void udc_handle_ep0_setup(struct lpc32xx_udc *udc)
                 default:
                         break;
                 }
-
+                break;
 
         case USB_REQ_SET_ADDRESS:
                 if (reqtype == (USB_TYPE_STANDARD | USB_RECIP_DEVICE)) {
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index b457fdaff297..1fe3deec35cf 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -419,8 +419,7 @@ static void ohci_usb_reset (struct ohci_hcd *ohci)
  * other cases where the next software may expect clean state from the
  * "firmware".  this is bus-neutral, unlike shutdown() methods.
  */
-static void
-ohci_shutdown (struct usb_hcd *hcd)
+static void _ohci_shutdown(struct usb_hcd *hcd)
 {
         struct ohci_hcd *ohci;
 
@@ -436,6 +435,16 @@ ohci_shutdown (struct usb_hcd *hcd)
         ohci->rh_state = OHCI_RH_HALTED;
 }
 
+static void ohci_shutdown(struct usb_hcd *hcd)
+{
+        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+        unsigned long flags;
+
+        spin_lock_irqsave(&ohci->lock, flags);
+        _ohci_shutdown(hcd);
+        spin_unlock_irqrestore(&ohci->lock, flags);
+}
+
 /*-------------------------------------------------------------------------*
  * HC functions
  *-------------------------------------------------------------------------*/
@@ -760,7 +769,7 @@ static void io_watchdog_func(struct timer_list *t)
  died:
                         usb_hc_died(ohci_to_hcd(ohci));
                         ohci_dump(ohci);
-                        ohci_shutdown(ohci_to_hcd(ohci));
+                        _ohci_shutdown(ohci_to_hcd(ohci));
                         goto done;
                 } else {
                         /* No write back because the done queue was empty */
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index 8616c52849c6..2b0ccd150209 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -104,7 +104,7 @@ static int xhci_rcar_is_gen2(struct device *dev)
         return of_device_is_compatible(node, "renesas,xhci-r8a7790") ||
                 of_device_is_compatible(node, "renesas,xhci-r8a7791") ||
                 of_device_is_compatible(node, "renesas,xhci-r8a7793") ||
-                of_device_is_compatible(node, "renensas,rcar-gen2-xhci");
+                of_device_is_compatible(node, "renesas,rcar-gen2-xhci");
 }
 
 static int xhci_rcar_is_gen3(struct device *dev)
diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
index dafc65911fc0..2ff7c911fbd0 100644
--- a/drivers/usb/host/xhci-tegra.c
+++ b/drivers/usb/host/xhci-tegra.c
@@ -1194,6 +1194,16 @@ static int tegra_xusb_probe(struct platform_device *pdev)
 
         tegra_xusb_config(tegra, regs);
 
+        /*
+         * The XUSB Falcon microcontroller can only address 40 bits, so set
+         * the DMA mask accordingly.
+         */
+        err = dma_set_mask_and_coherent(tegra->dev, DMA_BIT_MASK(40));
+        if (err < 0) {
+                dev_err(&pdev->dev, "failed to set DMA mask: %d\n", err);
+                goto put_rpm;
+        }
+
         err = tegra_xusb_load_firmware(tegra);
         if (err < 0) {
                 dev_err(&pdev->dev, "failed to load firmware: %d\n", err);
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index cc794e25a0b6..1d9ce9cbc831 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -38,7 +38,7 @@ MODULE_LICENSE("GPL");
 
 static int auto_delink_en = 1;
 module_param(auto_delink_en, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(auto_delink_en, "enable auto delink");
+MODULE_PARM_DESC(auto_delink_en, "auto delink mode (0=firmware, 1=software [default])");
 
 #ifdef CONFIG_REALTEK_AUTOPM
 static int ss_en = 1;
@@ -996,12 +996,15 @@ static int init_realtek_cr(struct us_data *us)
                         goto INIT_FAIL;
         }
 
-        if (CHECK_FW_VER(chip, 0x5888) || CHECK_FW_VER(chip, 0x5889) ||
-            CHECK_FW_VER(chip, 0x5901))
-                SET_AUTO_DELINK(chip);
-        if (STATUS_LEN(chip) == 16) {
-                if (SUPPORT_AUTO_DELINK(chip))
+        if (CHECK_PID(chip, 0x0138) || CHECK_PID(chip, 0x0158) ||
+            CHECK_PID(chip, 0x0159)) {
+                if (CHECK_FW_VER(chip, 0x5888) || CHECK_FW_VER(chip, 0x5889) ||
+                                CHECK_FW_VER(chip, 0x5901))
                         SET_AUTO_DELINK(chip);
+                if (STATUS_LEN(chip) == 16) {
+                        if (SUPPORT_AUTO_DELINK(chip))
+                                SET_AUTO_DELINK(chip);
+                }
         }
 #ifdef CONFIG_REALTEK_AUTOPM
         if (ss_en)
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index ea0d27a94afe..1cd9b6305b06 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -2100,7 +2100,7 @@ UNUSUAL_DEV(  0x14cd, 0x6600, 0x0201, 0x0201,
                 US_FL_IGNORE_RESIDUE ),
 
 /* Reported by Michael Büsch <m@bues.ch> */
-UNUSUAL_DEV(  0x152d, 0x0567, 0x0114, 0x0116,
+UNUSUAL_DEV(  0x152d, 0x0567, 0x0114, 0x0117,
                 "JMicron",
                 "USB to ATA/ATAPI Bridge",
                 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 15abe1d9958f..bcfdb55fd198 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -1446,7 +1446,7 @@ static enum pdo_err tcpm_caps_err(struct tcpm_port *port, const u32 *pdo,
                                 else if ((pdo_min_voltage(pdo[i]) ==
                                           pdo_min_voltage(pdo[i - 1])) &&
                                          (pdo_max_voltage(pdo[i]) ==
-                                          pdo_min_voltage(pdo[i - 1])))
+                                          pdo_max_voltage(pdo[i - 1])))
                                         return PDO_ERR_DUPE_PDO;
                                 break;
                         /*
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
index 9e90e969af55..7804869c6a31 100644
--- a/drivers/vhost/test.c
+++ b/drivers/vhost/test.c
@@ -22,6 +22,12 @@
  * Using this limit prevents one virtqueue from starving others. */
 #define VHOST_TEST_WEIGHT 0x80000
 
+/* Max number of packets transferred before requeueing the job.
+ * Using this limit prevents one virtqueue from starving others with
+ * pkts.
+ */
+#define VHOST_TEST_PKT_WEIGHT 256
+
 enum {
         VHOST_TEST_VQ = 0,
         VHOST_TEST_VQ_MAX = 1,
@@ -80,10 +86,8 @@ static void handle_vq(struct vhost_test *n)
                 }
                 vhost_add_used_and_signal(&n->dev, vq, head, 0);
                 total_len += len;
-                if (unlikely(total_len >= VHOST_TEST_WEIGHT)) {
-                        vhost_poll_queue(&vq->poll);
+                if (unlikely(vhost_exceeds_weight(vq, 0, total_len)))
                         break;
-                }
         }
 
         mutex_unlock(&vq->mutex);
@@ -115,7 +119,8 @@ static int vhost_test_open(struct inode *inode, struct file *f)
         dev = &n->dev;
         vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ];
         n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick;
-        vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX);
+        vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX, UIO_MAXIOV,
+                       VHOST_TEST_PKT_WEIGHT, VHOST_TEST_WEIGHT);
 
         f->private_data = n;
 
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 0536f8526359..5dc174ac8cac 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -203,7 +203,6 @@ EXPORT_SYMBOL_GPL(vhost_poll_init);
 int vhost_poll_start(struct vhost_poll *poll, struct file *file)
 {
         __poll_t mask;
-        int ret = 0;
 
         if (poll->wqh)
                 return 0;
@@ -213,10 +212,10 @@ int vhost_poll_start(struct vhost_poll *poll, struct file *file)
                 vhost_poll_wakeup(&poll->wait, 0, 0, poll_to_key(mask));
         if (mask & EPOLLERR) {
                 vhost_poll_stop(poll);
-                ret = -EINVAL;
+                return -EINVAL;
         }
 
-        return ret;
+        return 0;
 }
 EXPORT_SYMBOL_GPL(vhost_poll_start);
 
@@ -298,160 +297,6 @@ static void vhost_vq_meta_reset(struct vhost_dev *d)
                 __vhost_vq_meta_reset(d->vqs[i]);
 }
 
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-static void vhost_map_unprefetch(struct vhost_map *map)
-{
-        kfree(map->pages);
-        map->pages = NULL;
-        map->npages = 0;
-        map->addr = NULL;
-}
-
-static void vhost_uninit_vq_maps(struct vhost_virtqueue *vq)
-{
-        struct vhost_map *map[VHOST_NUM_ADDRS];
-        int i;
-
-        spin_lock(&vq->mmu_lock);
-        for (i = 0; i < VHOST_NUM_ADDRS; i++) {
-                map[i] = rcu_dereference_protected(vq->maps[i],
-                                  lockdep_is_held(&vq->mmu_lock));
-                if (map[i])
-                        rcu_assign_pointer(vq->maps[i], NULL);
-        }
-        spin_unlock(&vq->mmu_lock);
-
-        synchronize_rcu();
-
-        for (i = 0; i < VHOST_NUM_ADDRS; i++)
-                if (map[i])
-                        vhost_map_unprefetch(map[i]);
-
-}
-
-static void vhost_reset_vq_maps(struct vhost_virtqueue *vq)
-{
-        int i;
-
-        vhost_uninit_vq_maps(vq);
-        for (i = 0; i < VHOST_NUM_ADDRS; i++)
-                vq->uaddrs[i].size = 0;
-}
-
-static bool vhost_map_range_overlap(struct vhost_uaddr *uaddr,
-                                     unsigned long start,
-                                     unsigned long end)
-{
-        if (unlikely(!uaddr->size))
-                return false;
-
-        return !(end < uaddr->uaddr || start > uaddr->uaddr - 1 + uaddr->size);
-}
-
-static void vhost_invalidate_vq_start(struct vhost_virtqueue *vq,
-                                      int index,
-                                      unsigned long start,
-                                      unsigned long end)
-{
-        struct vhost_uaddr *uaddr = &vq->uaddrs[index];
-        struct vhost_map *map;
-        int i;
-
-        if (!vhost_map_range_overlap(uaddr, start, end))
-                return;
-
-        spin_lock(&vq->mmu_lock);
-        ++vq->invalidate_count;
-
-        map = rcu_dereference_protected(vq->maps[index],
-                                        lockdep_is_held(&vq->mmu_lock));
-        if (map) {
-                if (uaddr->write) {
-                        for (i = 0; i < map->npages; i++)
-                                set_page_dirty(map->pages[i]);
-                }
-                rcu_assign_pointer(vq->maps[index], NULL);
-        }
-        spin_unlock(&vq->mmu_lock);
-
-        if (map) {
-                synchronize_rcu();
-                vhost_map_unprefetch(map);
-        }
-}
-
-static void vhost_invalidate_vq_end(struct vhost_virtqueue *vq,
-                                    int index,
-                                    unsigned long start,
-                                    unsigned long end)
-{
-        if (!vhost_map_range_overlap(&vq->uaddrs[index], start, end))
-                return;
-
-        spin_lock(&vq->mmu_lock);
-        --vq->invalidate_count;
-        spin_unlock(&vq->mmu_lock);
-}
-
-static int vhost_invalidate_range_start(struct mmu_notifier *mn,
-                                        const struct mmu_notifier_range *range)
-{
-        struct vhost_dev *dev = container_of(mn, struct vhost_dev,
-                                             mmu_notifier);
-        int i, j;
-
-        if (!mmu_notifier_range_blockable(range))
-                return -EAGAIN;
-
-        for (i = 0; i < dev->nvqs; i++) {
-                struct vhost_virtqueue *vq = dev->vqs[i];
-
-                for (j = 0; j < VHOST_NUM_ADDRS; j++)
-                        vhost_invalidate_vq_start(vq, j,
-                                                  range->start,
-                                                  range->end);
-        }
-
-        return 0;
-}
-
-static void vhost_invalidate_range_end(struct mmu_notifier *mn,
-                                       const struct mmu_notifier_range *range)
-{
-        struct vhost_dev *dev = container_of(mn, struct vhost_dev,
-                                             mmu_notifier);
-        int i, j;
-
-        for (i = 0; i < dev->nvqs; i++) {
-                struct vhost_virtqueue *vq = dev->vqs[i];
-
-                for (j = 0; j < VHOST_NUM_ADDRS; j++)
-                        vhost_invalidate_vq_end(vq, j,
-                                                range->start,
-                                                range->end);
-        }
-}
-
-static const struct mmu_notifier_ops vhost_mmu_notifier_ops = {
-        .invalidate_range_start = vhost_invalidate_range_start,
-        .invalidate_range_end = vhost_invalidate_range_end,
-};
-
-static void vhost_init_maps(struct vhost_dev *dev)
-{
-        struct vhost_virtqueue *vq;
-        int i, j;
-
-        dev->mmu_notifier.ops = &vhost_mmu_notifier_ops;
-
-        for (i = 0; i < dev->nvqs; ++i) {
-                vq = dev->vqs[i];
-                for (j = 0; j < VHOST_NUM_ADDRS; j++)
-                        RCU_INIT_POINTER(vq->maps[j], NULL);
-        }
-}
-#endif
-
 static void vhost_vq_reset(struct vhost_dev *dev,
                            struct vhost_virtqueue *vq)
 {
@@ -480,11 +325,7 @@ static void vhost_vq_reset(struct vhost_dev *dev,
         vq->busyloop_timeout = 0;
         vq->umem = NULL;
         vq->iotlb = NULL;
-        vq->invalidate_count = 0;
         __vhost_vq_meta_reset(vq);
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        vhost_reset_vq_maps(vq);
-#endif
 }
 
 static int vhost_worker(void *data)
@@ -634,9 +475,7 @@ void vhost_dev_init(struct vhost_dev *dev,
         INIT_LIST_HEAD(&dev->read_list);
         INIT_LIST_HEAD(&dev->pending_list);
         spin_lock_init(&dev->iotlb_lock);
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        vhost_init_maps(dev);
-#endif
+
 
         for (i = 0; i < dev->nvqs; ++i) {
                 vq = dev->vqs[i];
@@ -645,7 +484,6 @@ void vhost_dev_init(struct vhost_dev *dev,
                 vq->heads = NULL;
                 vq->dev = dev;
                 mutex_init(&vq->mutex);
-                spin_lock_init(&vq->mmu_lock);
                 vhost_vq_reset(dev, vq);
                 if (vq->handle_kick)
                         vhost_poll_init(&vq->poll, vq->handle_kick,
@@ -725,18 +563,7 @@ long vhost_dev_set_owner(struct vhost_dev *dev)
         if (err)
                 goto err_cgroup;
 
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        err = mmu_notifier_register(&dev->mmu_notifier, dev->mm);
-        if (err)
-                goto err_mmu_notifier;
-#endif
-
         return 0;
-
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-err_mmu_notifier:
-        vhost_dev_free_iovecs(dev);
-#endif
 err_cgroup:
         kthread_stop(worker);
         dev->worker = NULL;
@@ -827,107 +654,6 @@ static void vhost_clear_msg(struct vhost_dev *dev)
         spin_unlock(&dev->iotlb_lock);
 }
 
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-static void vhost_setup_uaddr(struct vhost_virtqueue *vq,
-                              int index, unsigned long uaddr,
-                              size_t size, bool write)
-{
-        struct vhost_uaddr *addr = &vq->uaddrs[index];
-
-        addr->uaddr = uaddr;
-        addr->size = size;
-        addr->write = write;
-}
-
-static void vhost_setup_vq_uaddr(struct vhost_virtqueue *vq)
-{
-        vhost_setup_uaddr(vq, VHOST_ADDR_DESC,
-                          (unsigned long)vq->desc,
-                          vhost_get_desc_size(vq, vq->num),
-                          false);
-        vhost_setup_uaddr(vq, VHOST_ADDR_AVAIL,
-                          (unsigned long)vq->avail,
-                          vhost_get_avail_size(vq, vq->num),
-                          false);
-        vhost_setup_uaddr(vq, VHOST_ADDR_USED,
-                          (unsigned long)vq->used,
-                          vhost_get_used_size(vq, vq->num),
-                          true);
-}
-
-static int vhost_map_prefetch(struct vhost_virtqueue *vq,
-                               int index)
-{
-        struct vhost_map *map;
-        struct vhost_uaddr *uaddr = &vq->uaddrs[index];
-        struct page **pages;
-        int npages = DIV_ROUND_UP(uaddr->size, PAGE_SIZE);
-        int npinned;
-        void *vaddr, *v;
-        int err;
-        int i;
-
-        spin_lock(&vq->mmu_lock);
-
-        err = -EFAULT;
-        if (vq->invalidate_count)
-                goto err;
-
-        err = -ENOMEM;
-        map = kmalloc(sizeof(*map), GFP_ATOMIC);
-        if (!map)
-                goto err;
-
-        pages = kmalloc_array(npages, sizeof(struct page *), GFP_ATOMIC);
-        if (!pages)
-                goto err_pages;
-
-        err = EFAULT;
-        npinned = __get_user_pages_fast(uaddr->uaddr, npages,
-                                        uaddr->write, pages);
-        if (npinned > 0)
-                release_pages(pages, npinned);
-        if (npinned != npages)
-                goto err_gup;
-
-        for (i = 0; i < npinned; i++)
-                if (PageHighMem(pages[i]))
-                        goto err_gup;
-
-        vaddr = v = page_address(pages[0]);
-
-        /* For simplicity, fallback to userspace address if VA is not
-         * contigious.
-         */
-        for (i = 1; i < npinned; i++) {
-                v += PAGE_SIZE;
-                if (v != page_address(pages[i]))
-                        goto err_gup;
-        }
-
-        map->addr = vaddr + (uaddr->uaddr & (PAGE_SIZE - 1));
-        map->npages = npages;
-        map->pages = pages;
-
-        rcu_assign_pointer(vq->maps[index], map);
-        /* No need for a synchronize_rcu(). This function should be
-         * called by dev->worker so we are serialized with all
-         * readers.
-         */
-        spin_unlock(&vq->mmu_lock);
-
-        return 0;
-
-err_gup:
-        kfree(pages);
-err_pages:
-        kfree(map);
-err:
-        spin_unlock(&vq->mmu_lock);
-        return err;
-}
-#endif
-
 void vhost_dev_cleanup(struct vhost_dev *dev)
 {
         int i;
@@ -957,16 +683,8 @@ void vhost_dev_cleanup(struct vhost_dev *dev)
                 kthread_stop(dev->worker);
                 dev->worker = NULL;
         }
-        if (dev->mm) {
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-                mmu_notifier_unregister(&dev->mmu_notifier, dev->mm);
-#endif
+        if (dev->mm)
                 mmput(dev->mm);
-        }
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        for (i = 0; i < dev->nvqs; i++)
-                vhost_uninit_vq_maps(dev->vqs[i]);
-#endif
         dev->mm = NULL;
 }
 EXPORT_SYMBOL_GPL(vhost_dev_cleanup);
@@ -1195,26 +913,6 @@ static inline void __user *__vhost_get_user(struct vhost_virtqueue *vq,
 
 static inline int vhost_put_avail_event(struct vhost_virtqueue *vq)
 {
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        struct vhost_map *map;
-        struct vring_used *used;
-
-        if (!vq->iotlb) {
-                rcu_read_lock();
-
-                map = rcu_dereference(vq->maps[VHOST_ADDR_USED]);
-                if (likely(map)) {
-                        used = map->addr;
-                        *((__virtio16 *)&used->ring[vq->num]) =
-                                cpu_to_vhost16(vq, vq->avail_idx);
-                        rcu_read_unlock();
-                        return 0;
-                }
-
-                rcu_read_unlock();
-        }
-#endif
-
         return vhost_put_user(vq, cpu_to_vhost16(vq, vq->avail_idx),
                               vhost_avail_event(vq));
 }
@@ -1223,27 +921,6 @@ static inline int vhost_put_used(struct vhost_virtqueue *vq,
                                  struct vring_used_elem *head, int idx,
                                  int count)
 {
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        struct vhost_map *map;
-        struct vring_used *used;
-        size_t size;
-
-        if (!vq->iotlb) {
-                rcu_read_lock();
-
-                map = rcu_dereference(vq->maps[VHOST_ADDR_USED]);
-                if (likely(map)) {
-                        used = map->addr;
-                        size = count * sizeof(*head);
-                        memcpy(used->ring + idx, head, size);
-                        rcu_read_unlock();
-                        return 0;
-                }
-
-                rcu_read_unlock();
-        }
-#endif
-
         return vhost_copy_to_user(vq, vq->used->ring + idx, head,
                                   count * sizeof(*head));
 }
@@ -1251,25 +928,6 @@ static inline int vhost_put_used(struct vhost_virtqueue *vq,
 static inline int vhost_put_used_flags(struct vhost_virtqueue *vq)
 
 {
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        struct vhost_map *map;
-        struct vring_used *used;
-
-        if (!vq->iotlb) {
-                rcu_read_lock();
-
-                map = rcu_dereference(vq->maps[VHOST_ADDR_USED]);
-                if (likely(map)) {
-                        used = map->addr;
-                        used->flags = cpu_to_vhost16(vq, vq->used_flags);
-                        rcu_read_unlock();
-                        return 0;
-                }
-
-                rcu_read_unlock();
-        }
-#endif
-
         return vhost_put_user(vq, cpu_to_vhost16(vq, vq->used_flags),
                               &vq->used->flags);
 }
@@ -1277,25 +935,6 @@ static inline int vhost_put_used_flags(struct vhost_virtqueue *vq)
 static inline int vhost_put_used_idx(struct vhost_virtqueue *vq)
 
 {
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        struct vhost_map *map;
-        struct vring_used *used;
-
-        if (!vq->iotlb) {
-                rcu_read_lock();
-
-                map = rcu_dereference(vq->maps[VHOST_ADDR_USED]);
-                if (likely(map)) {
-                        used = map->addr;
-                        used->idx = cpu_to_vhost16(vq, vq->last_used_idx);
-                        rcu_read_unlock();
-                        return 0;
-                }
-
-                rcu_read_unlock();
-        }
-#endif
-
         return vhost_put_user(vq, cpu_to_vhost16(vq, vq->last_used_idx),
                               &vq->used->idx);
 }
@@ -1341,50 +980,12 @@ static void vhost_dev_unlock_vqs(struct vhost_dev *d)
 static inline int vhost_get_avail_idx(struct vhost_virtqueue *vq,
                                       __virtio16 *idx)
 {
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        struct vhost_map *map;
-        struct vring_avail *avail;
-
-        if (!vq->iotlb) {
-                rcu_read_lock();
-
-                map = rcu_dereference(vq->maps[VHOST_ADDR_AVAIL]);
-                if (likely(map)) {
-                        avail = map->addr;
-                        *idx = avail->idx;
-                        rcu_read_unlock();
-                        return 0;
-                }
-
-                rcu_read_unlock();
-        }
-#endif
-
         return vhost_get_avail(vq, *idx, &vq->avail->idx);
 }
 
 static inline int vhost_get_avail_head(struct vhost_virtqueue *vq,
                                        __virtio16 *head, int idx)
 {
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        struct vhost_map *map;
-        struct vring_avail *avail;
-
-        if (!vq->iotlb) {
-                rcu_read_lock();
-
-                map = rcu_dereference(vq->maps[VHOST_ADDR_AVAIL]);
-                if (likely(map)) {
-                        avail = map->addr;
-                        *head = avail->ring[idx & (vq->num - 1)];
-                        rcu_read_unlock();
-                        return 0;
-                }
-
-                rcu_read_unlock();
-        }
-#endif
-
         return vhost_get_avail(vq, *head,
                                &vq->avail->ring[idx & (vq->num - 1)]);
 }
@@ -1392,98 +993,24 @@ static inline int vhost_get_avail_head(struct vhost_virtqueue *vq,
 static inline int vhost_get_avail_flags(struct vhost_virtqueue *vq,
                                         __virtio16 *flags)
 {
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        struct vhost_map *map;
-        struct vring_avail *avail;
-
-        if (!vq->iotlb) {
-                rcu_read_lock();
-
-                map = rcu_dereference(vq->maps[VHOST_ADDR_AVAIL]);
-                if (likely(map)) {
-                        avail = map->addr;
-                        *flags = avail->flags;
-                        rcu_read_unlock();
-                        return 0;
-                }
-
-                rcu_read_unlock();
-        }
-#endif
-
         return vhost_get_avail(vq, *flags, &vq->avail->flags);
 }
 
 static inline int vhost_get_used_event(struct vhost_virtqueue *vq,
                                        __virtio16 *event)
 {
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        struct vhost_map *map;
-        struct vring_avail *avail;
-
-        if (!vq->iotlb) {
-                rcu_read_lock();
-                map = rcu_dereference(vq->maps[VHOST_ADDR_AVAIL]);
-                if (likely(map)) {
-                        avail = map->addr;
-                        *event = (__virtio16)avail->ring[vq->num];
-                        rcu_read_unlock();
-                        return 0;
-                }
-                rcu_read_unlock();
-        }
-#endif
-
         return vhost_get_avail(vq, *event, vhost_used_event(vq));
 }
 
 static inline int vhost_get_used_idx(struct vhost_virtqueue *vq,
                                      __virtio16 *idx)
 {
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        struct vhost_map *map;
-        struct vring_used *used;
-
-        if (!vq->iotlb) {
-                rcu_read_lock();
-
-                map = rcu_dereference(vq->maps[VHOST_ADDR_USED]);
-                if (likely(map)) {
-                        used = map->addr;
-                        *idx = used->idx;
-                        rcu_read_unlock();
-                        return 0;
-                }
-
-                rcu_read_unlock();
-        }
-#endif
-
         return vhost_get_used(vq, *idx, &vq->used->idx);
 }
 
 static inline int vhost_get_desc(struct vhost_virtqueue *vq,
                                  struct vring_desc *desc, int idx)
 {
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        struct vhost_map *map;
-        struct vring_desc *d;
-
-        if (!vq->iotlb) {
-                rcu_read_lock();
-
-                map = rcu_dereference(vq->maps[VHOST_ADDR_DESC]);
-                if (likely(map)) {
-                        d = map->addr;
-                        *desc = *(d + idx);
-                        rcu_read_unlock();
-                        return 0;
-                }
-
-                rcu_read_unlock();
-        }
-#endif
-
         return vhost_copy_from_user(vq, desc, vq->desc + idx, sizeof(*desc));
 }
 
@@ -1824,32 +1351,12 @@ static bool iotlb_access_ok(struct vhost_virtqueue *vq,
         return true;
 }
 
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-static void vhost_vq_map_prefetch(struct vhost_virtqueue *vq)
-{
-        struct vhost_map __rcu *map;
-        int i;
-
-        for (i = 0; i < VHOST_NUM_ADDRS; i++) {
-                rcu_read_lock();
-                map = rcu_dereference(vq->maps[i]);
-                rcu_read_unlock();
-                if (unlikely(!map))
-                        vhost_map_prefetch(vq, i);
-        }
-}
-#endif
-
 int vq_meta_prefetch(struct vhost_virtqueue *vq)
 {
         unsigned int num = vq->num;
 
-        if (!vq->iotlb) {
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-                vhost_vq_map_prefetch(vq);
-#endif
+        if (!vq->iotlb)
                 return 1;
-        }
 
         return iotlb_access_ok(vq, VHOST_ACCESS_RO, (u64)(uintptr_t)vq->desc,
                                vhost_get_desc_size(vq, num), VHOST_ADDR_DESC) &&
@@ -2060,16 +1567,6 @@ static long vhost_vring_set_num_addr(struct vhost_dev *d,
 
         mutex_lock(&vq->mutex);
 
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        /* Unregister MMU notifer to allow invalidation callback
-         * can access vq->uaddrs[] without holding a lock.
-         */
-        if (d->mm)
-                mmu_notifier_unregister(&d->mmu_notifier, d->mm);
-
-        vhost_uninit_vq_maps(vq);
-#endif
-
         switch (ioctl) {
         case VHOST_SET_VRING_NUM:
                 r = vhost_vring_set_num(d, vq, argp);
@@ -2081,13 +1578,6 @@ static long vhost_vring_set_num_addr(struct vhost_dev *d,
                 BUG();
         }
 
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        vhost_setup_vq_uaddr(vq);
-
-        if (d->mm)
-                mmu_notifier_register(&d->mmu_notifier, d->mm);
-#endif
-
         mutex_unlock(&vq->mutex);
 
         return r;
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index 42a8c2a13ab1..e9ed2722b633 100644
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -12,9 +12,6 @@
 #include <linux/virtio_config.h>
 #include <linux/virtio_ring.h>
 #include <linux/atomic.h>
-#include <linux/pagemap.h>
-#include <linux/mmu_notifier.h>
-#include <asm/cacheflush.h>
 
 struct vhost_work;
 typedef void (*vhost_work_fn_t)(struct vhost_work *work);
@@ -83,24 +80,6 @@ enum vhost_uaddr_type {
         VHOST_NUM_ADDRS = 3,
 };
 
-struct vhost_map {
-        int npages;
-        void *addr;
-        struct page **pages;
-};
-
-struct vhost_uaddr {
-        unsigned long uaddr;
-        size_t size;
-        bool write;
-};
-
-#if defined(CONFIG_MMU_NOTIFIER) && ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE == 0
-#define VHOST_ARCH_CAN_ACCEL_UACCESS 0
-#else
-#define VHOST_ARCH_CAN_ACCEL_UACCESS 0
-#endif
-
 /* The virtqueue structure describes a queue attached to a device. */
 struct vhost_virtqueue {
         struct vhost_dev *dev;
@@ -111,22 +90,7 @@ struct vhost_virtqueue {
         struct vring_desc __user *desc;
         struct vring_avail __user *avail;
         struct vring_used __user *used;
-
-#if VHOST_ARCH_CAN_ACCEL_UACCESS
-        /* Read by memory accessors, modified by meta data
-         * prefetching, MMU notifier and vring ioctl().
-         * Synchonrized through mmu_lock (writers) and RCU (writers
-         * and readers).
-         */
-        struct vhost_map __rcu *maps[VHOST_NUM_ADDRS];
-        /* Read by MMU notifier, modified by vring ioctl(),
-         * synchronized through MMU notifier
-         * registering/unregistering.
-         */
-        struct vhost_uaddr uaddrs[VHOST_NUM_ADDRS];
-#endif
         const struct vhost_umem_node *meta_iotlb[VHOST_NUM_ADDRS];
-
         struct file *kick;
         struct eventfd_ctx *call_ctx;
         struct eventfd_ctx *error_ctx;
@@ -181,8 +145,6 @@ struct vhost_virtqueue {
         bool user_be;
 #endif
         u32 busyloop_timeout;
-        spinlock_t mmu_lock;
-        int invalidate_count;
 };
 
 struct vhost_msg_node {
@@ -196,9 +158,6 @@ struct vhost_msg_node {
 
 struct vhost_dev {
         struct mm_struct *mm;
-#ifdef CONFIG_MMU_NOTIFIER
-        struct mmu_notifier mmu_notifier;
-#endif
         struct mutex mutex;
         struct vhost_virtqueue **vqs;
         int nvqs;
diff --git a/drivers/video/fbdev/acornfb.c b/drivers/video/fbdev/acornfb.c
index 92f23e3bc27a..7cacae5a8797 100644
--- a/drivers/video/fbdev/acornfb.c
+++ b/drivers/video/fbdev/acornfb.c
@@ -858,6 +858,7 @@ static void acornfb_parse_dram(char *opt)
                 case 'M':
                 case 'm':
                         size *= 1024;
+                        /* Fall through */
                 case 'K':
                 case 'k':
                         size *= 1024;
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
index 4eacfb1ce1ac..eb729d704836 100644
--- a/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
@@ -168,7 +168,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
                 soft_margin = new_margin;
                 reload = soft_margin * (mem_fclk_21285 / 256);
                 watchdog_ping();
-                /* Fall */
+                /* Fall through */
         case WDIOC_GETTIMEOUT:
                 ret = put_user(soft_margin, int_arg);
                 break;
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index ae1df496bf38..adcabd9473eb 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -386,8 +386,8 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
          */
         trace_swiotlb_bounced(dev, dev_addr, size, swiotlb_force);
 
-        map = swiotlb_tbl_map_single(dev, start_dma_addr, phys, size, dir,
-                                     attrs);
+        map = swiotlb_tbl_map_single(dev, start_dma_addr, phys,
+                                     size, size, dir, attrs);
         if (map == (phys_addr_t)DMA_MAPPING_ERROR)
                 return DMA_MAPPING_ERROR;
 
@@ -397,7 +397,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
          * Ensure that the address returned is DMA'ble
          */
         if (unlikely(!dma_capable(dev, dev_addr, size))) {
-                swiotlb_tbl_unmap_single(dev, map, size, dir,
+                swiotlb_tbl_unmap_single(dev, map, size, size, dir,
                                 attrs | DMA_ATTR_SKIP_CPU_SYNC);
                 return DMA_MAPPING_ERROR;
         }
@@ -433,7 +433,7 @@ static void xen_unmap_single(struct device *hwdev, dma_addr_t dev_addr,
 
         /* NOTE: We use dev_addr here, not paddr! */
         if (is_xen_swiotlb_buffer(dev_addr))
-                swiotlb_tbl_unmap_single(hwdev, paddr, size, dir, attrs);
+                swiotlb_tbl_unmap_single(hwdev, paddr, size, size, dir, attrs);
 }
 
 static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
diff --git a/fs/afs/cell.c b/fs/afs/cell.c
index a2a87117d262..fd5133e26a38 100644
--- a/fs/afs/cell.c
+++ b/fs/afs/cell.c
@@ -74,6 +74,7 @@ struct afs_cell *afs_lookup_cell_rcu(struct afs_net *net,
                         cell = rcu_dereference_raw(net->ws_cell);
                         if (cell) {
                                 afs_get_cell(cell);
+                                ret = 0;
                                 break;
                         }
                         ret = -EDESTADDRREQ;
@@ -108,6 +109,9 @@ struct afs_cell *afs_lookup_cell_rcu(struct afs_net *net,
 
         done_seqretry(&net->cells_lock, seq);
 
+        if (ret != 0 && cell)
+                afs_put_cell(net, cell);
+
         return ret == 0 ? cell : ERR_PTR(ret);
 }
 
diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index 81207dc3c997..139b4e3cc946 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -959,7 +959,8 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,
                                  inode ? AFS_FS_I(inode) : NULL);
         } else {
                 trace_afs_lookup(dvnode, &dentry->d_name,
-                                 inode ? AFS_FS_I(inode) : NULL);
+                                 IS_ERR_OR_NULL(inode) ? NULL
+                                 : AFS_FS_I(inode));
         }
         return d;
 }
diff --git a/fs/afs/yfsclient.c b/fs/afs/yfsclient.c
index 2575503170fc..ca2452806ebf 100644
--- a/fs/afs/yfsclient.c
+++ b/fs/afs/yfsclient.c
@@ -2171,7 +2171,7 @@ int yfs_fs_store_opaque_acl2(struct afs_fs_cursor *fc, const struct afs_acl *acl
                key_serial(fc->key), vnode->fid.vid, vnode->fid.vnode);
 
         size = round_up(acl->size, 4);
-        call = afs_alloc_flat_call(net, &yfs_RXYFSStoreStatus,
+        call = afs_alloc_flat_call(net, &yfs_RXYFSStoreOpaqueACL2,
                                    sizeof(__be32) * 2 +
                                    sizeof(struct yfs_xdr_YFSFid) +
                                    sizeof(__be32) + size,
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index e078cc55b989..b3c8b886bf64 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -913,8 +913,9 @@ get_more_pages:
                         if (page_offset(page) >= ceph_wbc.i_size) {
                                 dout("%p page eof %llu\n",
                                      page, ceph_wbc.i_size);
-                                if (ceph_wbc.size_stable ||
-                                    page_offset(page) >= i_size_read(inode))
+                                if ((ceph_wbc.size_stable ||
+                                    page_offset(page) >= i_size_read(inode)) &&
+                                    clear_page_dirty_for_io(page))
                                         mapping->a_ops->invalidatepage(page,
                                                                 0, PAGE_SIZE);
                                 unlock_page(page);
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index d98dcd976c80..ce0f5658720a 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1301,6 +1301,7 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap,
 {
         struct ceph_inode_info *ci = cap->ci;
         struct inode *inode = &ci->vfs_inode;
+        struct ceph_buffer *old_blob = NULL;
         struct cap_msg_args arg;
         int held, revoking;
         int wake = 0;
@@ -1365,7 +1366,7 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap,
         ci->i_requested_max_size = arg.max_size;
 
         if (flushing & CEPH_CAP_XATTR_EXCL) {
-                __ceph_build_xattrs_blob(ci);
+                old_blob = __ceph_build_xattrs_blob(ci);
                 arg.xattr_version = ci->i_xattrs.version;
                 arg.xattr_buf = ci->i_xattrs.blob;
         } else {
@@ -1409,6 +1410,8 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap,
 
         spin_unlock(&ci->i_ceph_lock);
 
+        ceph_buffer_put(old_blob);
+
         ret = send_cap_msg(&arg);
         if (ret < 0) {
                 dout("error sending cap msg, must requeue %p\n", inode);
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 791f84a13bb8..18500edefc56 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -736,6 +736,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page,
         int issued, new_issued, info_caps;
         struct timespec64 mtime, atime, ctime;
         struct ceph_buffer *xattr_blob = NULL;
+        struct ceph_buffer *old_blob = NULL;
         struct ceph_string *pool_ns = NULL;
         struct ceph_cap *new_cap = NULL;
         int err = 0;
@@ -881,7 +882,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page,
         if ((ci->i_xattrs.version == 0 || !(issued & CEPH_CAP_XATTR_EXCL))  &&
             le64_to_cpu(info->xattr_version) > ci->i_xattrs.version) {
                 if (ci->i_xattrs.blob)
-                        ceph_buffer_put(ci->i_xattrs.blob);
+                        old_blob = ci->i_xattrs.blob;
                 ci->i_xattrs.blob = xattr_blob;
                 if (xattr_blob)
                         memcpy(ci->i_xattrs.blob->vec.iov_base,
@@ -1022,8 +1023,8 @@ static int fill_inode(struct inode *inode, struct page *locked_page,
 out:
         if (new_cap)
                 ceph_put_cap(mdsc, new_cap);
-        if (xattr_blob)
-                ceph_buffer_put(xattr_blob);
+        ceph_buffer_put(old_blob);
+        ceph_buffer_put(xattr_blob);
         ceph_put_string(pool_ns);
         return err;
 }
diff --git a/fs/ceph/locks.c b/fs/ceph/locks.c
index ac9b53b89365..5083e238ad15 100644
--- a/fs/ceph/locks.c
+++ b/fs/ceph/locks.c
@@ -111,8 +111,7 @@ static int ceph_lock_message(u8 lock_type, u16 operation, struct inode *inode,
                 req->r_wait_for_completion = ceph_lock_wait_for_completion;
 
         err = ceph_mdsc_do_request(mdsc, inode, req);
-
-        if (operation == CEPH_MDS_OP_GETFILELOCK) {
+        if (!err && operation == CEPH_MDS_OP_GETFILELOCK) {
                 fl->fl_pid = -le64_to_cpu(req->r_reply_info.filelock_reply->pid);
                 if (CEPH_LOCK_SHARED == req->r_reply_info.filelock_reply->type)
                         fl->fl_type = F_RDLCK;
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c
index 4c6494eb02b5..ccfcc66aaf44 100644
--- a/fs/ceph/snap.c
+++ b/fs/ceph/snap.c
@@ -465,6 +465,7 @@ void ceph_queue_cap_snap(struct ceph_inode_info *ci)
         struct inode *inode = &ci->vfs_inode;
         struct ceph_cap_snap *capsnap;
         struct ceph_snap_context *old_snapc, *new_snapc;
+        struct ceph_buffer *old_blob = NULL;
         int used, dirty;
 
         capsnap = kzalloc(sizeof(*capsnap), GFP_NOFS);
@@ -541,7 +542,7 @@ void ceph_queue_cap_snap(struct ceph_inode_info *ci)
         capsnap->gid = inode->i_gid;
 
         if (dirty & CEPH_CAP_XATTR_EXCL) {
-                __ceph_build_xattrs_blob(ci);
+                old_blob = __ceph_build_xattrs_blob(ci);
                 capsnap->xattr_blob =
                         ceph_buffer_get(ci->i_xattrs.blob);
                 capsnap->xattr_version = ci->i_xattrs.version;
@@ -584,6 +585,7 @@ update_snapc:
         }
         spin_unlock(&ci->i_ceph_lock);
 
+        ceph_buffer_put(old_blob);
         kfree(capsnap);
         ceph_put_snap_context(old_snapc);
 }
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index d2352fd95dbc..6b9f1ee7de85 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -926,7 +926,7 @@ extern int ceph_getattr(const struct path *path, struct kstat *stat,
 int __ceph_setxattr(struct inode *, const char *, const void *, size_t, int);
 ssize_t __ceph_getxattr(struct inode *, const char *, void *, size_t);
 extern ssize_t ceph_listxattr(struct dentry *, char *, size_t);
-extern void __ceph_build_xattrs_blob(struct ceph_inode_info *ci);
+extern struct ceph_buffer *__ceph_build_xattrs_blob(struct ceph_inode_info *ci);
 extern void __ceph_destroy_xattrs(struct ceph_inode_info *ci);
 extern const struct xattr_handler *ceph_xattr_handlers[];
 
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 37b458a9af3a..939eab7aa219 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -754,12 +754,15 @@ static int __get_required_blob_size(struct ceph_inode_info *ci, int name_size,
 
 /*
  * If there are dirty xattrs, reencode xattrs into the prealloc_blob
- * and swap into place.
+ * and swap into place.  It returns the old i_xattrs.blob (or NULL) so
+ * that it can be freed by the caller as the i_ceph_lock is likely to be
+ * held.
  */
-void __ceph_build_xattrs_blob(struct ceph_inode_info *ci)
+struct ceph_buffer *__ceph_build_xattrs_blob(struct ceph_inode_info *ci)
 {
         struct rb_node *p;
         struct ceph_inode_xattr *xattr = NULL;
+        struct ceph_buffer *old_blob = NULL;
         void *dest;
 
         dout("__build_xattrs_blob %p\n", &ci->vfs_inode);
@@ -790,12 +793,14 @@ void __ceph_build_xattrs_blob(struct ceph_inode_info *ci)
                         dest - ci->i_xattrs.prealloc_blob->vec.iov_base;
 
                 if (ci->i_xattrs.blob)
-                        ceph_buffer_put(ci->i_xattrs.blob);
+                        old_blob = ci->i_xattrs.blob;
                 ci->i_xattrs.blob = ci->i_xattrs.prealloc_blob;
                 ci->i_xattrs.prealloc_blob = NULL;
                 ci->i_xattrs.dirty = false;
                 ci->i_xattrs.version++;
         }
+
+        return old_blob;
 }
 
 static inline int __get_request_mask(struct inode *in) {
@@ -1036,6 +1041,7 @@ int __ceph_setxattr(struct inode *inode, const char *name,
         struct ceph_inode_info *ci = ceph_inode(inode);
         struct ceph_mds_client *mdsc = ceph_sb_to_client(inode->i_sb)->mdsc;
         struct ceph_cap_flush *prealloc_cf = NULL;
+        struct ceph_buffer *old_blob = NULL;
         int issued;
         int err;
         int dirty = 0;
@@ -1109,13 +1115,15 @@ retry:
                 struct ceph_buffer *blob;
 
                 spin_unlock(&ci->i_ceph_lock);
-                dout(" preaallocating new blob size=%d\n", required_blob_size);
+                ceph_buffer_put(old_blob); /* Shouldn't be required */
+                dout(" pre-allocating new blob size=%d\n", required_blob_size);
                 blob = ceph_buffer_new(required_blob_size, GFP_NOFS);
                 if (!blob)
                         goto do_sync_unlocked;
                 spin_lock(&ci->i_ceph_lock);
+                /* prealloc_blob can't be released while holding i_ceph_lock */
                 if (ci->i_xattrs.prealloc_blob)
-                        ceph_buffer_put(ci->i_xattrs.prealloc_blob);
+                        old_blob = ci->i_xattrs.prealloc_blob;
                 ci->i_xattrs.prealloc_blob = blob;
                 goto retry;
         }
@@ -1131,6 +1139,7 @@ retry:
         }
 
         spin_unlock(&ci->i_ceph_lock);
+        ceph_buffer_put(old_blob);
         if (lock_snap_rwsem)
                 up_read(&mdsc->snap_rwsem);
         if (dirty)
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index 4b21a90015a9..99caf77df4a2 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -152,5 +152,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
 extern const struct export_operations cifs_export_ops;
 #endif /* CONFIG_CIFS_NFSD_EXPORT */
 
-#define CIFS_VERSION   "2.21"
+#define CIFS_VERSION   "2.22"
 #endif                          /* _CIFSFS_H */
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index e23234207fc2..592a6cea2b79 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -579,6 +579,7 @@ extern void rqst_page_get_length(struct smb_rqst *rqst, unsigned int page,
                                 unsigned int *len, unsigned int *offset);
 
 void extract_unc_hostname(const char *unc, const char **h, size_t *len);
+int copy_path_name(char *dst, const char *src);
 
 #ifdef CONFIG_CIFS_DFS_UPCALL
 static inline int get_dfs_path(const unsigned int xid, struct cifs_ses *ses,
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index e2f95965065d..3907653e63c7 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -942,10 +942,8 @@ PsxDelete:
                                        PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else { /* BB add path length overrun check */
-                name_len = strnlen(fileName, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, fileName, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, fileName);
         }
 
         params = 6 + name_len;
@@ -1015,10 +1013,8 @@ DelFileRetry:
                                               remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {                /* BB improve check for buffer overruns BB */
-                name_len = strnlen(name, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->fileName, name, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->fileName, name);
         }
         pSMB->SearchAttributes =
             cpu_to_le16(ATTR_READONLY | ATTR_HIDDEN | ATTR_SYSTEM);
@@ -1062,10 +1058,8 @@ RmDirRetry:
                                               remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {                /* BB improve check for buffer overruns BB */
-                name_len = strnlen(name, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->DirName, name, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->DirName, name);
         }
 
         pSMB->BufferFormat = 0x04;
@@ -1107,10 +1101,8 @@ MkDirRetry:
                                               remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {                /* BB improve check for buffer overruns BB */
-                name_len = strnlen(name, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->DirName, name, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->DirName, name);
         }
 
         pSMB->BufferFormat = 0x04;
@@ -1157,10 +1149,8 @@ PsxCreat:
                                        PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(name, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, name, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, name);
         }
 
         params = 6 + name_len;
@@ -1324,11 +1314,9 @@ OldOpenRetry:
                                       fileName, PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {                /* BB improve check for buffer overruns BB */
+        } else {
                 count = 0;      /* no pad */
-                name_len = strnlen(fileName, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->fileName, fileName, name_len);
+                name_len = copy_path_name(pSMB->fileName, fileName);
         }
         if (*pOplock & REQ_OPLOCK)
                 pSMB->OpenFlags = cpu_to_le16(REQ_OPLOCK);
@@ -1442,11 +1430,8 @@ openRetry:
                 /* BB improve check for buffer overruns BB */
                 /* no pad */
                 count = 0;
-                name_len = strnlen(path, PATH_MAX);
-                /* trailing null */
-                name_len++;
+                name_len = copy_path_name(req->fileName, path);
                 req->NameLength = cpu_to_le16(name_len);
-                strncpy(req->fileName, path, name_len);
         }
 
         if (*oplock & REQ_OPLOCK)
@@ -2812,15 +2797,10 @@ renameRetry:
                                        remap);
                 name_len2 += 1 /* trailing null */  + 1 /* Signature word */ ;
                 name_len2 *= 2; /* convert to bytes */
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(from_name, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->OldFileName, from_name, name_len);
-                name_len2 = strnlen(to_name, PATH_MAX);
-                name_len2++;    /* trailing null */
+        } else {
+                name_len = copy_path_name(pSMB->OldFileName, from_name);
+                name_len2 = copy_path_name(pSMB->OldFileName+name_len+1, to_name);
                 pSMB->OldFileName[name_len] = 0x04;  /* 2nd buffer format */
-                strncpy(&pSMB->OldFileName[name_len + 1], to_name, name_len2);
-                name_len2++;    /* trailing null */
                 name_len2++;    /* signature byte */
         }
 
@@ -2962,15 +2942,10 @@ copyRetry:
                                        toName, PATH_MAX, nls_codepage, remap);
                 name_len2 += 1 /* trailing null */  + 1 /* Signature word */ ;
                 name_len2 *= 2; /* convert to bytes */
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(fromName, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->OldFileName, fromName, name_len);
-                name_len2 = strnlen(toName, PATH_MAX);
-                name_len2++;    /* trailing null */
+        } else {
+                name_len = copy_path_name(pSMB->OldFileName, fromName);
                 pSMB->OldFileName[name_len] = 0x04;  /* 2nd buffer format */
-                strncpy(&pSMB->OldFileName[name_len + 1], toName, name_len2);
-                name_len2++;    /* trailing null */
+                name_len2 = copy_path_name(pSMB->OldFileName+name_len+1, toName);
                 name_len2++;    /* signature byte */
         }
 
@@ -3021,10 +2996,8 @@ createSymLinkRetry:
                 name_len++;     /* trailing null */
                 name_len *= 2;
 
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(fromName, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, fromName, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, fromName);
         }
         params = 6 + name_len;
         pSMB->MaxSetupCount = 0;
@@ -3044,10 +3017,8 @@ createSymLinkRetry:
                                         PATH_MAX, nls_codepage, remap);
                 name_len_target++;      /* trailing null */
                 name_len_target *= 2;
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len_target = strnlen(toName, PATH_MAX);
-                name_len_target++;      /* trailing null */
-                strncpy(data_offset, toName, name_len_target);
+        } else {
+                name_len_target = copy_path_name(data_offset, toName);
         }
 
         pSMB->MaxParameterCount = cpu_to_le16(2);
@@ -3109,10 +3080,8 @@ createHardLinkRetry:
                 name_len++;     /* trailing null */
                 name_len *= 2;
 
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(toName, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, toName, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, toName);
         }
         params = 6 + name_len;
         pSMB->MaxSetupCount = 0;
@@ -3131,10 +3100,8 @@ createHardLinkRetry:
                                        PATH_MAX, nls_codepage, remap);
                 name_len_target++;      /* trailing null */
                 name_len_target *= 2;
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len_target = strnlen(fromName, PATH_MAX);
-                name_len_target++;      /* trailing null */
-                strncpy(data_offset, fromName, name_len_target);
+        } else {
+                name_len_target = copy_path_name(data_offset, fromName);
         }
 
         pSMB->MaxParameterCount = cpu_to_le16(2);
@@ -3213,15 +3180,10 @@ winCreateHardLinkRetry:
                                        remap);
                 name_len2 += 1 /* trailing null */  + 1 /* Signature word */ ;
                 name_len2 *= 2; /* convert to bytes */
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(from_name, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->OldFileName, from_name, name_len);
-                name_len2 = strnlen(to_name, PATH_MAX);
-                name_len2++;    /* trailing null */
+        } else {
+                name_len = copy_path_name(pSMB->OldFileName, from_name);
                 pSMB->OldFileName[name_len] = 0x04;     /* 2nd buffer format */
-                strncpy(&pSMB->OldFileName[name_len + 1], to_name, name_len2);
-                name_len2++;    /* trailing null */
+                name_len2 = copy_path_name(pSMB->OldFileName+name_len+1, to_name);
                 name_len2++;    /* signature byte */
         }
 
@@ -3271,10 +3233,8 @@ querySymLinkRetry:
                                            remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(searchName, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, searchName, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, searchName);
         }
 
         params = 2 /* level */  + 4 /* rsrvd */  + name_len /* incl null */ ;
@@ -3691,10 +3651,8 @@ queryAclRetry:
                 name_len *= 2;
                 pSMB->FileName[name_len] = 0;
                 pSMB->FileName[name_len+1] = 0;
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(searchName, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, searchName, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, searchName);
         }
 
         params = 2 /* level */  + 4 /* rsrvd */  + name_len /* incl null */ ;
@@ -3776,10 +3734,8 @@ setAclRetry:
                                            PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(fileName, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, fileName, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, fileName);
         }
         params = 6 + name_len;
         pSMB->MaxParameterCount = cpu_to_le16(2);
@@ -4184,9 +4140,7 @@ QInfRetry:
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {
-                name_len = strnlen(search_name, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, search_name, name_len);
+                name_len = copy_path_name(pSMB->FileName, search_name);
         }
         pSMB->BufferFormat = 0x04;
         name_len++; /* account for buffer type byte */
@@ -4321,10 +4275,8 @@ QPathInfoRetry:
                                        PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(search_name, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, search_name, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, search_name);
         }
 
         params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */;
@@ -4490,10 +4442,8 @@ UnixQPathInfoRetry:
                                        PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(searchName, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, searchName, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, searchName);
         }
 
         params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */;
@@ -4593,17 +4543,16 @@ findFirstRetry:
                         pSMB->FileName[name_len+1] = 0;
                         name_len += 2;
                 }
-        } else {        /* BB add check for overrun of SMB buf BB */
-                name_len = strnlen(searchName, PATH_MAX);
-/* BB fix here and in unicode clause above ie
-                if (name_len > buffersize-header)
-                        free buffer exit; BB */
-                strncpy(pSMB->FileName, searchName, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, searchName);
                 if (msearch) {
-                        pSMB->FileName[name_len] = CIFS_DIR_SEP(cifs_sb);
-                        pSMB->FileName[name_len+1] = '*';
-                        pSMB->FileName[name_len+2] = 0;
-                        name_len += 3;
+                        if (WARN_ON_ONCE(name_len > PATH_MAX-2))
+                                name_len = PATH_MAX-2;
+                        /* overwrite nul byte */
+                        pSMB->FileName[name_len-1] = CIFS_DIR_SEP(cifs_sb);
+                        pSMB->FileName[name_len] = '*';
+                        pSMB->FileName[name_len+1] = 0;
+                        name_len += 2;
                 }
         }
 
@@ -4898,10 +4847,8 @@ GetInodeNumberRetry:
                                            remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(search_name, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, search_name, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, search_name);
         }
 
         params = 2 /* level */  + 4 /* rsrvd */  + name_len /* incl null */ ;
@@ -5008,9 +4955,7 @@ getDFSRetry:
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(search_name, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->RequestFileName, search_name, name_len);
+                name_len = copy_path_name(pSMB->RequestFileName, search_name);
         }
 
         if (ses->server->sign)
@@ -5663,10 +5608,8 @@ SetEOFRetry:
                                        PATH_MAX, cifs_sb->local_nls, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(file_name, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, file_name, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, file_name);
         }
         params = 6 + name_len;
         data_count = sizeof(struct file_end_of_file_info);
@@ -5959,10 +5902,8 @@ SetTimesRetry:
                                        PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(fileName, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, fileName, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, fileName);
         }
 
         params = 6 + name_len;
@@ -6040,10 +5981,8 @@ SetAttrLgcyRetry:
                                        PATH_MAX, nls_codepage);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(fileName, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->fileName, fileName, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->fileName, fileName);
         }
         pSMB->attr = cpu_to_le16(dos_attrs);
         pSMB->BufferFormat = 0x04;
@@ -6203,10 +6142,8 @@ setPermsRetry:
                                        PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(file_name, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, file_name, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, file_name);
         }
 
         params = 6 + name_len;
@@ -6298,10 +6235,8 @@ QAllEAsRetry:
                                        PATH_MAX, nls_codepage, remap);
                 list_len++;     /* trailing null */
                 list_len *= 2;
-        } else {        /* BB improve the check for buffer overruns BB */
-                list_len = strnlen(searchName, PATH_MAX);
-                list_len++;     /* trailing null */
-                strncpy(pSMB->FileName, searchName, list_len);
+        } else {
+                list_len = copy_path_name(pSMB->FileName, searchName);
         }
 
         params = 2 /* level */ + 4 /* reserved */ + list_len /* includes NUL */;
@@ -6480,10 +6415,8 @@ SetEARetry:
                                        PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
-        } else {        /* BB improve the check for buffer overruns BB */
-                name_len = strnlen(fileName, PATH_MAX);
-                name_len++;     /* trailing null */
-                strncpy(pSMB->FileName, fileName, name_len);
+        } else {
+                name_len = copy_path_name(pSMB->FileName, fileName);
         }
 
         params = 6 + name_len;
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index a15a6e738eb5..5299effa6f7d 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1113,7 +1113,7 @@ cifs_demultiplex_thread(void *p)
                 mempool_resize(cifs_req_poolp, length + cifs_min_rcv);
 
         set_freezable();
-        allow_signal(SIGKILL);
+        allow_kernel_signal(SIGKILL);
         while (server->tcpStatus != CifsExiting) {
                 if (try_to_freeze())
                         continue;
@@ -2981,6 +2981,7 @@ static int
 cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses)
 {
         int rc = 0;
+        int is_domain = 0;
         const char *delim, *payload;
         char *desc;
         ssize_t len;
@@ -3028,6 +3029,7 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses)
                         rc = PTR_ERR(key);
                         goto out_err;
                 }
+                is_domain = 1;
         }
 
         down_read(&key->sem);
@@ -3085,6 +3087,26 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses)
                 goto out_key_put;
         }
 
+        /*
+         * If we have a domain key then we must set the domainName in the
+         * for the request.
+         */
+        if (is_domain && ses->domainName) {
+                vol->domainname = kstrndup(ses->domainName,
+                                           strlen(ses->domainName),
+                                           GFP_KERNEL);
+                if (!vol->domainname) {
+                        cifs_dbg(FYI, "Unable to allocate %zd bytes for "
+                                 "domain\n", len);
+                        rc = -ENOMEM;
+                        kfree(vol->username);
+                        vol->username = NULL;
+                        kzfree(vol->password);
+                        vol->password = NULL;
+                        goto out_key_put;
+                }
+        }
+
 out_key_put:
         up_read(&key->sem);
         key_put(key);
@@ -4209,16 +4231,19 @@ build_unc_path_to_root(const struct smb_vol *vol,
                 strlen(vol->prepath) + 1 : 0;
         unsigned int unc_len = strnlen(vol->UNC, MAX_TREE_SIZE + 1);
 
+        if (unc_len > MAX_TREE_SIZE)
+                return ERR_PTR(-EINVAL);
+
         full_path = kmalloc(unc_len + pplen + 1, GFP_KERNEL);
         if (full_path == NULL)
                 return ERR_PTR(-ENOMEM);
 
-        strncpy(full_path, vol->UNC, unc_len);
+        memcpy(full_path, vol->UNC, unc_len);
         pos = full_path + unc_len;
 
         if (pplen) {
                 *pos = CIFS_DIR_SEP(cifs_sb);
-                strncpy(pos + 1, vol->prepath, pplen);
+                memcpy(pos + 1, vol->prepath, pplen);
                 pos += pplen;
         }
 
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index f26a48dd2e39..be424e81e3ad 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -69,11 +69,10 @@ cifs_build_path_to_root(struct smb_vol *vol, struct cifs_sb_info *cifs_sb,
                 return full_path;
 
         if (dfsplen)
-                strncpy(full_path, tcon->treeName, dfsplen);
+                memcpy(full_path, tcon->treeName, dfsplen);
         full_path[dfsplen] = CIFS_DIR_SEP(cifs_sb);
-        strncpy(full_path + dfsplen + 1, vol->prepath, pplen);
+        memcpy(full_path + dfsplen + 1, vol->prepath, pplen);
         convert_delimiter(full_path, CIFS_DIR_SEP(cifs_sb));
-        full_path[dfsplen + pplen] = 0; /* add trailing null */
         return full_path;
 }
 
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index f383877a6511..5ad83bdb9bea 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -1011,3 +1011,25 @@ void extract_unc_hostname(const char *unc, const char **h, size_t *len)
         *h = unc;
         *len = end - unc;
 }
+
+/**
+ * copy_path_name - copy src path to dst, possibly truncating
+ *
+ * returns number of bytes written (including trailing nul)
+ */
+int copy_path_name(char *dst, const char *src)
+{
+        int name_len;
+
+        /*
+         * PATH_MAX includes nul, so if strlen(src) >= PATH_MAX it
+         * will truncate and strlen(dst) will be PATH_MAX-1
+         */
+        name_len = strscpy(dst, src, PATH_MAX);
+        if (WARN_ON_ONCE(name_len < 0))
+                name_len = PATH_MAX-1;
+
+        /* we count the trailing nul */
+        name_len++;
+        return name_len;
+}
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index dcd49ad60c83..4c764ff7edd2 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -159,13 +159,16 @@ static void ascii_ssetup_strings(char **pbcc_area, struct cifs_ses *ses,
                                  const struct nls_table *nls_cp)
 {
         char *bcc_ptr = *pbcc_area;
+        int len;
 
         /* copy user */
         /* BB what about null user mounts - check that we do this BB */
         /* copy user */
         if (ses->user_name != NULL) {
-                strncpy(bcc_ptr, ses->user_name, CIFS_MAX_USERNAME_LEN);
-                bcc_ptr += strnlen(ses->user_name, CIFS_MAX_USERNAME_LEN);
+                len = strscpy(bcc_ptr, ses->user_name, CIFS_MAX_USERNAME_LEN);
+                if (WARN_ON_ONCE(len < 0))
+                        len = CIFS_MAX_USERNAME_LEN - 1;
+                bcc_ptr += len;
         }
         /* else null user mount */
         *bcc_ptr = 0;
@@ -173,8 +176,10 @@ static void ascii_ssetup_strings(char **pbcc_area, struct cifs_ses *ses,
 
         /* copy domain */
         if (ses->domainName != NULL) {
-                strncpy(bcc_ptr, ses->domainName, CIFS_MAX_DOMAINNAME_LEN);
-                bcc_ptr += strnlen(ses->domainName, CIFS_MAX_DOMAINNAME_LEN);
+                len = strscpy(bcc_ptr, ses->domainName, CIFS_MAX_DOMAINNAME_LEN);
+                if (WARN_ON_ONCE(len < 0))
+                        len = CIFS_MAX_DOMAINNAME_LEN - 1;
+                bcc_ptr += len;
         } /* else we will send a null domain name
              so the server will default to its own domain */
         *bcc_ptr = 0;
@@ -242,9 +247,10 @@ static void decode_ascii_ssetup(char **pbcc_area, __u16 bleft,
 
         kfree(ses->serverOS);
 
-        ses->serverOS = kzalloc(len + 1, GFP_KERNEL);
+        ses->serverOS = kmalloc(len + 1, GFP_KERNEL);
         if (ses->serverOS) {
-                strncpy(ses->serverOS, bcc_ptr, len);
+                memcpy(ses->serverOS, bcc_ptr, len);
+                ses->serverOS[len] = 0;
                 if (strncmp(ses->serverOS, "OS/2", 4) == 0)
                         cifs_dbg(FYI, "OS/2 server\n");
         }
@@ -258,9 +264,11 @@ static void decode_ascii_ssetup(char **pbcc_area, __u16 bleft,
 
         kfree(ses->serverNOS);
 
-        ses->serverNOS = kzalloc(len + 1, GFP_KERNEL);
-        if (ses->serverNOS)
-                strncpy(ses->serverNOS, bcc_ptr, len);
+        ses->serverNOS = kmalloc(len + 1, GFP_KERNEL);
+        if (ses->serverNOS) {
+                memcpy(ses->serverNOS, bcc_ptr, len);
+                ses->serverNOS[len] = 0;
+        }
 
         bcc_ptr += len + 1;
         bleft -= len + 1;
diff --git a/fs/configfs/configfs_internal.h b/fs/configfs/configfs_internal.h
index f752d83a9c44..520f1813e789 100644
--- a/fs/configfs/configfs_internal.h
+++ b/fs/configfs/configfs_internal.h
@@ -20,6 +20,15 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 
+struct configfs_fragment {
+        atomic_t frag_count;
+        struct rw_semaphore frag_sem;
+        bool frag_dead;
+};
+
+void put_fragment(struct configfs_fragment *);
+struct configfs_fragment *get_fragment(struct configfs_fragment *);
+
 struct configfs_dirent {
         atomic_t                s_count;
         int                     s_dependent_count;
@@ -34,6 +43,7 @@ struct configfs_dirent {
 #ifdef CONFIG_LOCKDEP
         int                     s_depth;
 #endif
+        struct configfs_fragment *s_frag;
 };
 
 #define CONFIGFS_ROOT           0x0001
@@ -61,8 +71,8 @@ extern int configfs_create(struct dentry *, umode_t mode, void (*init)(struct in
 extern int configfs_create_file(struct config_item *, const struct configfs_attribute *);
 extern int configfs_create_bin_file(struct config_item *,
                                     const struct configfs_bin_attribute *);
-extern int configfs_make_dirent(struct configfs_dirent *,
-                                struct dentry *, void *, umode_t, int);
+extern int configfs_make_dirent(struct configfs_dirent *, struct dentry *,
+                                void *, umode_t, int, struct configfs_fragment *);
 extern int configfs_dirent_is_ready(struct configfs_dirent *);
 
 extern void configfs_hash_and_remove(struct dentry * dir, const char * name);
@@ -137,6 +147,7 @@ static inline void release_configfs_dirent(struct configfs_dirent * sd)
 {
         if (!(sd->s_type & CONFIGFS_ROOT)) {
                 kfree(sd->s_iattr);
+                put_fragment(sd->s_frag);
                 kmem_cache_free(configfs_dir_cachep, sd);
         }
 }
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 92112915de8e..79fc25aaa8cd 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -151,11 +151,38 @@ configfs_adjust_dir_dirent_depth_after_populate(struct configfs_dirent *sd)
 
 #endif /* CONFIG_LOCKDEP */
 
+static struct configfs_fragment *new_fragment(void)
+{
+        struct configfs_fragment *p;
+
+        p = kmalloc(sizeof(struct configfs_fragment), GFP_KERNEL);
+        if (p) {
+                atomic_set(&p->frag_count, 1);
+                init_rwsem(&p->frag_sem);
+                p->frag_dead = false;
+        }
+        return p;
+}
+
+void put_fragment(struct configfs_fragment *frag)
+{
+        if (frag && atomic_dec_and_test(&frag->frag_count))
+                kfree(frag);
+}
+
+struct configfs_fragment *get_fragment(struct configfs_fragment *frag)
+{
+        if (likely(frag))
+                atomic_inc(&frag->frag_count);
+        return frag;
+}
+
 /*
  * Allocates a new configfs_dirent and links it to the parent configfs_dirent
  */
 static struct configfs_dirent *configfs_new_dirent(struct configfs_dirent *parent_sd,
-                                                   void *element, int type)
+                                                   void *element, int type,
+                                                   struct configfs_fragment *frag)
 {
         struct configfs_dirent * sd;
 
@@ -175,6 +202,7 @@ static struct configfs_dirent *configfs_new_dirent(struct configfs_dirent *paren
                 kmem_cache_free(configfs_dir_cachep, sd);
                 return ERR_PTR(-ENOENT);
         }
+        sd->s_frag = get_fragment(frag);
         list_add(&sd->s_sibling, &parent_sd->s_children);
         spin_unlock(&configfs_dirent_lock);
 
@@ -209,11 +237,11 @@ static int configfs_dirent_exists(struct configfs_dirent *parent_sd,
 
 int configfs_make_dirent(struct configfs_dirent * parent_sd,
                          struct dentry * dentry, void * element,
-                         umode_t mode, int type)
+                         umode_t mode, int type, struct configfs_fragment *frag)
 {
         struct configfs_dirent * sd;
 
-        sd = configfs_new_dirent(parent_sd, element, type);
+        sd = configfs_new_dirent(parent_sd, element, type, frag);
         if (IS_ERR(sd))
                 return PTR_ERR(sd);
 
@@ -260,7 +288,8 @@ static void init_symlink(struct inode * inode)
  *      until it is validated by configfs_dir_set_ready()
  */
 
-static int configfs_create_dir(struct config_item *item, struct dentry *dentry)
+static int configfs_create_dir(struct config_item *item, struct dentry *dentry,
+                                struct configfs_fragment *frag)
 {
         int error;
         umode_t mode = S_IFDIR| S_IRWXU | S_IRUGO | S_IXUGO;
@@ -273,7 +302,8 @@ static int configfs_create_dir(struct config_item *item, struct dentry *dentry)
                 return error;
 
         error = configfs_make_dirent(p->d_fsdata, dentry, item, mode,
-                                     CONFIGFS_DIR | CONFIGFS_USET_CREATING);
+                                     CONFIGFS_DIR | CONFIGFS_USET_CREATING,
+                                     frag);
         if (unlikely(error))
                 return error;
 
@@ -338,9 +368,10 @@ int configfs_create_link(struct configfs_symlink *sl,
 {
         int err = 0;
         umode_t mode = S_IFLNK | S_IRWXUGO;
+        struct configfs_dirent *p = parent->d_fsdata;
 
-        err = configfs_make_dirent(parent->d_fsdata, dentry, sl, mode,
-                                   CONFIGFS_ITEM_LINK);
+        err = configfs_make_dirent(p, dentry, sl, mode,
+                                   CONFIGFS_ITEM_LINK, p->s_frag);
         if (!err) {
                 err = configfs_create(dentry, mode, init_symlink);
                 if (err) {
@@ -599,7 +630,8 @@ static int populate_attrs(struct config_item *item)
 
 static int configfs_attach_group(struct config_item *parent_item,
                                  struct config_item *item,
-                                 struct dentry *dentry);
+                                 struct dentry *dentry,
+                                 struct configfs_fragment *frag);
 static void configfs_detach_group(struct config_item *item);
 
 static void detach_groups(struct config_group *group)
@@ -647,7 +679,8 @@ static void detach_groups(struct config_group *group)
  * try using vfs_mkdir.  Just a thought.
  */
 static int create_default_group(struct config_group *parent_group,
-                                struct config_group *group)
+                                struct config_group *group,
+                                struct configfs_fragment *frag)
 {
         int ret;
         struct configfs_dirent *sd;
@@ -663,7 +696,7 @@ static int create_default_group(struct config_group *parent_group,
                 d_add(child, NULL);
 
                 ret = configfs_attach_group(&parent_group->cg_item,
-                                            &group->cg_item, child);
+                                            &group->cg_item, child, frag);
                 if (!ret) {
                         sd = child->d_fsdata;
                         sd->s_type |= CONFIGFS_USET_DEFAULT;
@@ -677,13 +710,14 @@ static int create_default_group(struct config_group *parent_group,
         return ret;
 }
 
-static int populate_groups(struct config_group *group)
+static int populate_groups(struct config_group *group,
+                           struct configfs_fragment *frag)
 {
         struct config_group *new_group;
         int ret = 0;
 
         list_for_each_entry(new_group, &group->default_groups, group_entry) {
-                ret = create_default_group(group, new_group);
+                ret = create_default_group(group, new_group, frag);
                 if (ret) {
                         detach_groups(group);
                         break;
@@ -797,11 +831,12 @@ static void link_group(struct config_group *parent_group, struct config_group *g
  */
 static int configfs_attach_item(struct config_item *parent_item,
                                 struct config_item *item,
-                                struct dentry *dentry)
+                                struct dentry *dentry,
+                                struct configfs_fragment *frag)
 {
         int ret;
 
-        ret = configfs_create_dir(item, dentry);
+        ret = configfs_create_dir(item, dentry, frag);
         if (!ret) {
                 ret = populate_attrs(item);
                 if (ret) {
@@ -831,12 +866,13 @@ static void configfs_detach_item(struct config_item *item)
 
 static int configfs_attach_group(struct config_item *parent_item,
                                  struct config_item *item,
-                                 struct dentry *dentry)
+                                 struct dentry *dentry,
+                                 struct configfs_fragment *frag)
 {
         int ret;
         struct configfs_dirent *sd;
 
-        ret = configfs_attach_item(parent_item, item, dentry);
+        ret = configfs_attach_item(parent_item, item, dentry, frag);
         if (!ret) {
                 sd = dentry->d_fsdata;
                 sd->s_type |= CONFIGFS_USET_DIR;
@@ -852,7 +888,7 @@ static int configfs_attach_group(struct config_item *parent_item,
                  */
                 inode_lock_nested(d_inode(dentry), I_MUTEX_CHILD);
                 configfs_adjust_dir_dirent_depth_before_populate(sd);
-                ret = populate_groups(to_config_group(item));
+                ret = populate_groups(to_config_group(item), frag);
                 if (ret) {
                         configfs_detach_item(item);
                         d_inode(dentry)->i_flags |= S_DEAD;
@@ -1247,6 +1283,7 @@ static int configfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
         struct configfs_dirent *sd;
         const struct config_item_type *type;
         struct module *subsys_owner = NULL, *new_item_owner = NULL;
+        struct configfs_fragment *frag;
         char *name;
 
         sd = dentry->d_parent->d_fsdata;
@@ -1265,6 +1302,12 @@ static int configfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
                 goto out;
         }
 
+        frag = new_fragment();
+        if (!frag) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
         /* Get a working ref for the duration of this function */
         parent_item = configfs_get_config_item(dentry->d_parent);
         type = parent_item->ci_type;
@@ -1367,9 +1410,9 @@ static int configfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
         spin_unlock(&configfs_dirent_lock);
 
         if (group)
-                ret = configfs_attach_group(parent_item, item, dentry);
+                ret = configfs_attach_group(parent_item, item, dentry, frag);
         else
-                ret = configfs_attach_item(parent_item, item, dentry);
+                ret = configfs_attach_item(parent_item, item, dentry, frag);
 
         spin_lock(&configfs_dirent_lock);
         sd->s_type &= ~CONFIGFS_USET_IN_MKDIR;
@@ -1406,6 +1449,7 @@ out_put:
          * reference.
          */
         config_item_put(parent_item);
+        put_fragment(frag);
 
 out:
         return ret;
@@ -1417,6 +1461,7 @@ static int configfs_rmdir(struct inode *dir, struct dentry *dentry)
         struct config_item *item;
         struct configfs_subsystem *subsys;
         struct configfs_dirent *sd;
+        struct configfs_fragment *frag;
         struct module *subsys_owner = NULL, *dead_item_owner = NULL;
         int ret;
 
@@ -1474,6 +1519,16 @@ static int configfs_rmdir(struct inode *dir, struct dentry *dentry)
                 }
         } while (ret == -EAGAIN);
 
+        frag = sd->s_frag;
+        if (down_write_killable(&frag->frag_sem)) {
+                spin_lock(&configfs_dirent_lock);
+                configfs_detach_rollback(dentry);
+                spin_unlock(&configfs_dirent_lock);
+                return -EINTR;
+        }
+        frag->frag_dead = true;
+        up_write(&frag->frag_sem);
+
         /* Get a working ref for the duration of this function */
         item = configfs_get_config_item(dentry);
 
@@ -1574,7 +1629,7 @@ static int configfs_dir_open(struct inode *inode, struct file *file)
          */
         err = -ENOENT;
         if (configfs_dirent_is_ready(parent_sd)) {
-                file->private_data = configfs_new_dirent(parent_sd, NULL, 0);
+                file->private_data = configfs_new_dirent(parent_sd, NULL, 0, NULL);
                 if (IS_ERR(file->private_data))
                         err = PTR_ERR(file->private_data);
                 else
@@ -1732,8 +1787,13 @@ int configfs_register_group(struct config_group *parent_group,
 {
         struct configfs_subsystem *subsys = parent_group->cg_subsys;
         struct dentry *parent;
+        struct configfs_fragment *frag;
         int ret;
 
+        frag = new_fragment();
+        if (!frag)
+                return -ENOMEM;
+
         mutex_lock(&subsys->su_mutex);
         link_group(parent_group, group);
         mutex_unlock(&subsys->su_mutex);
@@ -1741,7 +1801,7 @@ int configfs_register_group(struct config_group *parent_group,
         parent = parent_group->cg_item.ci_dentry;
 
         inode_lock_nested(d_inode(parent), I_MUTEX_PARENT);
-        ret = create_default_group(parent_group, group);
+        ret = create_default_group(parent_group, group, frag);
         if (ret)
                 goto err_out;
 
@@ -1749,12 +1809,14 @@ int configfs_register_group(struct config_group *parent_group,
         configfs_dir_set_ready(group->cg_item.ci_dentry->d_fsdata);
         spin_unlock(&configfs_dirent_lock);
         inode_unlock(d_inode(parent));
+        put_fragment(frag);
         return 0;
 err_out:
         inode_unlock(d_inode(parent));
         mutex_lock(&subsys->su_mutex);
         unlink_group(group);
         mutex_unlock(&subsys->su_mutex);
+        put_fragment(frag);
         return ret;
 }
 EXPORT_SYMBOL(configfs_register_group);
@@ -1770,16 +1832,12 @@ void configfs_unregister_group(struct config_group *group)
         struct configfs_subsystem *subsys = group->cg_subsys;
         struct dentry *dentry = group->cg_item.ci_dentry;
         struct dentry *parent = group->cg_item.ci_parent->ci_dentry;
+        struct configfs_dirent *sd = dentry->d_fsdata;
+        struct configfs_fragment *frag = sd->s_frag;
 
-        mutex_lock(&subsys->su_mutex);
-        if (!group->cg_item.ci_parent->ci_group) {
-                /*
-                 * The parent has already been unlinked and detached
-                 * due to a rmdir.
-                 */
-                goto unlink_group;
-        }
-        mutex_unlock(&subsys->su_mutex);
+        down_write(&frag->frag_sem);
+        frag->frag_dead = true;
+        up_write(&frag->frag_sem);
 
         inode_lock_nested(d_inode(parent), I_MUTEX_PARENT);
         spin_lock(&configfs_dirent_lock);
@@ -1796,7 +1854,6 @@ void configfs_unregister_group(struct config_group *group)
         dput(dentry);
 
         mutex_lock(&subsys->su_mutex);
-unlink_group:
         unlink_group(group);
         mutex_unlock(&subsys->su_mutex);
 }
@@ -1853,10 +1910,17 @@ int configfs_register_subsystem(struct configfs_subsystem *subsys)
         struct dentry *dentry;
         struct dentry *root;
         struct configfs_dirent *sd;
+        struct configfs_fragment *frag;
+
+        frag = new_fragment();
+        if (!frag)
+                return -ENOMEM;
 
         root = configfs_pin_fs();
-        if (IS_ERR(root))
+        if (IS_ERR(root)) {
+                put_fragment(frag);
                 return PTR_ERR(root);
+        }
 
         if (!group->cg_item.ci_name)
                 group->cg_item.ci_name = group->cg_item.ci_namebuf;
@@ -1872,7 +1936,7 @@ int configfs_register_subsystem(struct configfs_subsystem *subsys)
                 d_add(dentry, NULL);
 
                 err = configfs_attach_group(sd->s_element, &group->cg_item,
-                                            dentry);
+                                            dentry, frag);
                 if (err) {
                         BUG_ON(d_inode(dentry));
                         d_drop(dentry);
@@ -1890,6 +1954,7 @@ int configfs_register_subsystem(struct configfs_subsystem *subsys)
                 unlink_group(group);
                 configfs_release_fs();
         }
+        put_fragment(frag);
 
         return err;
 }
@@ -1899,12 +1964,18 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys)
         struct config_group *group = &subsys->su_group;
         struct dentry *dentry = group->cg_item.ci_dentry;
         struct dentry *root = dentry->d_sb->s_root;
+        struct configfs_dirent *sd = dentry->d_fsdata;
+        struct configfs_fragment *frag = sd->s_frag;
 
         if (dentry->d_parent != root) {
                 pr_err("Tried to unregister non-subsystem!\n");
                 return;
         }
 
+        down_write(&frag->frag_sem);
+        frag->frag_dead = true;
+        up_write(&frag->frag_sem);
+
         inode_lock_nested(d_inode(root),
                           I_MUTEX_PARENT);
         inode_lock_nested(d_inode(dentry), I_MUTEX_CHILD);
diff --git a/fs/configfs/file.c b/fs/configfs/file.c
index 61e4db4390a1..fb65b706cc0d 100644
--- a/fs/configfs/file.c
+++ b/fs/configfs/file.c
@@ -39,40 +39,44 @@ struct configfs_buffer {
         bool                    write_in_progress;
         char                    *bin_buffer;
         int                     bin_buffer_size;
+        int                     cb_max_size;
+        struct config_item      *item;
+        struct module           *owner;
+        union {
+                struct configfs_attribute       *attr;
+                struct configfs_bin_attribute   *bin_attr;
+        };
 };
 
+static inline struct configfs_fragment *to_frag(struct file *file)
+{
+        struct configfs_dirent *sd = file->f_path.dentry->d_fsdata;
 
-/**
- *      fill_read_buffer - allocate and fill buffer from item.
- *      @dentry:        dentry pointer.
- *      @buffer:        data buffer for file.
- *
- *      Allocate @buffer->page, if it hasn't been already, then call the
- *      config_item's show() method to fill the buffer with this attribute's
- *      data.
- *      This is called only once, on the file's first read.
- */
-static int fill_read_buffer(struct dentry * dentry, struct configfs_buffer * buffer)
+        return sd->s_frag;
+}
+
+static int fill_read_buffer(struct file *file, struct configfs_buffer *buffer)
 {
-        struct configfs_attribute * attr = to_attr(dentry);
-        struct config_item * item = to_item(dentry->d_parent);
-        int ret = 0;
-        ssize_t count;
+        struct configfs_fragment *frag = to_frag(file);
+        ssize_t count = -ENOENT;
 
         if (!buffer->page)
                 buffer->page = (char *) get_zeroed_page(GFP_KERNEL);
         if (!buffer->page)
                 return -ENOMEM;
 
-        count = attr->show(item, buffer->page);
-
-        BUG_ON(count > (ssize_t)SIMPLE_ATTR_SIZE);
-        if (count >= 0) {
-                buffer->needs_read_fill = 0;
-                buffer->count = count;
-        } else
-                ret = count;
-        return ret;
+        down_read(&frag->frag_sem);
+        if (!frag->frag_dead)
+                count = buffer->attr->show(buffer->item, buffer->page);
+        up_read(&frag->frag_sem);
+
+        if (count < 0)
+                return count;
+        if (WARN_ON_ONCE(count > (ssize_t)SIMPLE_ATTR_SIZE))
+                return -EIO;
+        buffer->needs_read_fill = 0;
+        buffer->count = count;
+        return 0;
 }
 
 /**
@@ -97,12 +101,13 @@ static int fill_read_buffer(struct dentry * dentry, struct configfs_buffer * buf
 static ssize_t
 configfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 {
-        struct configfs_buffer * buffer = file->private_data;
+        struct configfs_buffer *buffer = file->private_data;
         ssize_t retval = 0;
 
         mutex_lock(&buffer->mutex);
         if (buffer->needs_read_fill) {
-                if ((retval = fill_read_buffer(file->f_path.dentry,buffer)))
+                retval = fill_read_buffer(file, buffer);
+                if (retval)
                         goto out;
         }
         pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n",
@@ -138,10 +143,8 @@ static ssize_t
 configfs_read_bin_file(struct file *file, char __user *buf,
                        size_t count, loff_t *ppos)
 {
+        struct configfs_fragment *frag = to_frag(file);
         struct configfs_buffer *buffer = file->private_data;
-        struct dentry *dentry = file->f_path.dentry;
-        struct config_item *item = to_item(dentry->d_parent);
-        struct configfs_bin_attribute *bin_attr = to_bin_attr(dentry);
         ssize_t retval = 0;
         ssize_t len = min_t(size_t, count, PAGE_SIZE);
 
@@ -156,14 +159,19 @@ configfs_read_bin_file(struct file *file, char __user *buf,
 
         if (buffer->needs_read_fill) {
                 /* perform first read with buf == NULL to get extent */
-                len = bin_attr->read(item, NULL, 0);
+                down_read(&frag->frag_sem);
+                if (!frag->frag_dead)
+                        len = buffer->bin_attr->read(buffer->item, NULL, 0);
+                else
+                        len = -ENOENT;
+                up_read(&frag->frag_sem);
                 if (len <= 0) {
                         retval = len;
                         goto out;
                 }
 
                 /* do not exceed the maximum value */
-                if (bin_attr->cb_max_size && len > bin_attr->cb_max_size) {
+                if (buffer->cb_max_size && len > buffer->cb_max_size) {
                         retval = -EFBIG;
                         goto out;
                 }
@@ -176,7 +184,13 @@ configfs_read_bin_file(struct file *file, char __user *buf,
                 buffer->bin_buffer_size = len;
 
                 /* perform second read to fill buffer */
-                len = bin_attr->read(item, buffer->bin_buffer, len);
+                down_read(&frag->frag_sem);
+                if (!frag->frag_dead)
+                        len = buffer->bin_attr->read(buffer->item,
+                                                     buffer->bin_buffer, len);
+                else
+                        len = -ENOENT;
+                up_read(&frag->frag_sem);
                 if (len < 0) {
                         retval = len;
                         vfree(buffer->bin_buffer);
@@ -226,25 +240,17 @@ fill_write_buffer(struct configfs_buffer * buffer, const char __user * buf, size
         return error ? -EFAULT : count;
 }
 
-
-/**
- *      flush_write_buffer - push buffer to config_item.
- *      @dentry:        dentry to the attribute
- *      @buffer:        data buffer for file.
- *      @count:         number of bytes
- *
- *      Get the correct pointers for the config_item and the attribute we're
- *      dealing with, then call the store() method for the attribute,
- *      passing the buffer that we acquired in fill_write_buffer().
- */
-
 static int
-flush_write_buffer(struct dentry * dentry, struct configfs_buffer * buffer, size_t count)
+flush_write_buffer(struct file *file, struct configfs_buffer *buffer, size_t count)
 {
-        struct configfs_attribute * attr = to_attr(dentry);
-        struct config_item * item = to_item(dentry->d_parent);
-
-        return attr->store(item, buffer->page, count);
+        struct configfs_fragment *frag = to_frag(file);
+        int res = -ENOENT;
+
+        down_read(&frag->frag_sem);
+        if (!frag->frag_dead)
+                res = buffer->attr->store(buffer->item, buffer->page, count);
+        up_read(&frag->frag_sem);
+        return res;
 }
 
 
@@ -268,13 +274,13 @@ flush_write_buffer(struct dentry * dentry, struct configfs_buffer * buffer, size
 static ssize_t
 configfs_write_file(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
 {
-        struct configfs_buffer * buffer = file->private_data;
+        struct configfs_buffer *buffer = file->private_data;
         ssize_t len;
 
         mutex_lock(&buffer->mutex);
         len = fill_write_buffer(buffer, buf, count);
         if (len > 0)
-                len = flush_write_buffer(file->f_path.dentry, buffer, len);
+                len = flush_write_buffer(file, buffer, len);
         if (len > 0)
                 *ppos += len;
         mutex_unlock(&buffer->mutex);
@@ -299,8 +305,6 @@ configfs_write_bin_file(struct file *file, const char __user *buf,
                         size_t count, loff_t *ppos)
 {
         struct configfs_buffer *buffer = file->private_data;
-        struct dentry *dentry = file->f_path.dentry;
-        struct configfs_bin_attribute *bin_attr = to_bin_attr(dentry);
         void *tbuf = NULL;
         ssize_t len;
 
@@ -316,8 +320,8 @@ configfs_write_bin_file(struct file *file, const char __user *buf,
         /* buffer grows? */
         if (*ppos + count > buffer->bin_buffer_size) {
 
-                if (bin_attr->cb_max_size &&
-                        *ppos + count > bin_attr->cb_max_size) {
+                if (buffer->cb_max_size &&
+                        *ppos + count > buffer->cb_max_size) {
                         len = -EFBIG;
                         goto out;
                 }
@@ -349,31 +353,51 @@ out:
         return len;
 }
 
-static int check_perm(struct inode * inode, struct file * file, int type)
+static int __configfs_open_file(struct inode *inode, struct file *file, int type)
 {
-        struct config_item *item = configfs_get_config_item(file->f_path.dentry->d_parent);
-        struct configfs_attribute * attr = to_attr(file->f_path.dentry);
-        struct configfs_bin_attribute *bin_attr = NULL;
-        struct configfs_buffer * buffer;
-        struct configfs_item_operations * ops = NULL;
-        int error = 0;
+        struct dentry *dentry = file->f_path.dentry;
+        struct configfs_fragment *frag = to_frag(file);
+        struct configfs_attribute *attr;
+        struct configfs_buffer *buffer;
+        int error;
 
-        if (!item || !attr)
-                goto Einval;
+        error = -ENOMEM;
+        buffer = kzalloc(sizeof(struct configfs_buffer), GFP_KERNEL);
+        if (!buffer)
+                goto out;
 
-        if (type & CONFIGFS_ITEM_BIN_ATTR)
-                bin_attr = to_bin_attr(file->f_path.dentry);
+        error = -ENOENT;
+        down_read(&frag->frag_sem);
+        if (unlikely(frag->frag_dead))
+                goto out_free_buffer;
 
-        /* Grab the module reference for this attribute if we have one */
-        if (!try_module_get(attr->ca_owner)) {
-                error = -ENODEV;
-                goto Done;
+        error = -EINVAL;
+        buffer->item = to_item(dentry->d_parent);
+        if (!buffer->item)
+                goto out_free_buffer;
+
+        attr = to_attr(dentry);
+        if (!attr)
+                goto out_put_item;
+
+        if (type & CONFIGFS_ITEM_BIN_ATTR) {
+                buffer->bin_attr = to_bin_attr(dentry);
+                buffer->cb_max_size = buffer->bin_attr->cb_max_size;
+        } else {
+                buffer->attr = attr;
         }
 
-        if (item->ci_type)
-                ops = item->ci_type->ct_item_ops;
-        else
-                goto Eaccess;
+        buffer->owner = attr->ca_owner;
+        /* Grab the module reference for this attribute if we have one */
+        error = -ENODEV;
+        if (!try_module_get(buffer->owner))
+                goto out_put_item;
+
+        error = -EACCES;
+        if (!buffer->item->ci_type)
+                goto out_put_module;
+
+        buffer->ops = buffer->item->ci_type->ct_item_ops;
 
         /* File needs write support.
          * The inode's perms must say it's ok,
@@ -381,13 +405,11 @@ static int check_perm(struct inode * inode, struct file * file, int type)
          */
         if (file->f_mode & FMODE_WRITE) {
                 if (!(inode->i_mode & S_IWUGO))
-                        goto Eaccess;
-
+                        goto out_put_module;
                 if ((type & CONFIGFS_ITEM_ATTR) && !attr->store)
-                        goto Eaccess;
-
-                if ((type & CONFIGFS_ITEM_BIN_ATTR) && !bin_attr->write)
-                        goto Eaccess;
+                        goto out_put_module;
+                if ((type & CONFIGFS_ITEM_BIN_ATTR) && !buffer->bin_attr->write)
+                        goto out_put_module;
         }
 
         /* File needs read support.
@@ -396,92 +418,72 @@ static int check_perm(struct inode * inode, struct file * file, int type)
          */
         if (file->f_mode & FMODE_READ) {
                 if (!(inode->i_mode & S_IRUGO))
-                        goto Eaccess;
-
+                        goto out_put_module;
                 if ((type & CONFIGFS_ITEM_ATTR) && !attr->show)
-                        goto Eaccess;
-
-                if ((type & CONFIGFS_ITEM_BIN_ATTR) && !bin_attr->read)
-                        goto Eaccess;
+                        goto out_put_module;
+                if ((type & CONFIGFS_ITEM_BIN_ATTR) && !buffer->bin_attr->read)
+                        goto out_put_module;
         }
 
-        /* No error? Great, allocate a buffer for the file, and store it
-         * it in file->private_data for easy access.
-         */
-        buffer = kzalloc(sizeof(struct configfs_buffer),GFP_KERNEL);
-        if (!buffer) {
-                error = -ENOMEM;
-                goto Enomem;
-        }
         mutex_init(&buffer->mutex);
         buffer->needs_read_fill = 1;
         buffer->read_in_progress = false;
         buffer->write_in_progress = false;
-        buffer->ops = ops;
         file->private_data = buffer;
-        goto Done;
+        up_read(&frag->frag_sem);
+        return 0;
 
- Einval:
-        error = -EINVAL;
-        goto Done;
- Eaccess:
-        error = -EACCES;
- Enomem:
-        module_put(attr->ca_owner);
- Done:
-        if (error && item)
-                config_item_put(item);
+out_put_module:
+        module_put(buffer->owner);
+out_put_item:
+        config_item_put(buffer->item);
+out_free_buffer:
+        up_read(&frag->frag_sem);
+        kfree(buffer);
+out:
         return error;
 }
 
 static int configfs_release(struct inode *inode, struct file *filp)
 {
-        struct config_item * item = to_item(filp->f_path.dentry->d_parent);
-        struct configfs_attribute * attr = to_attr(filp->f_path.dentry);
-        struct module * owner = attr->ca_owner;
-        struct configfs_buffer * buffer = filp->private_data;
-
-        if (item)
-                config_item_put(item);
-        /* After this point, attr should not be accessed. */
-        module_put(owner);
-
-        if (buffer) {
-                if (buffer->page)
-                        free_page((unsigned long)buffer->page);
-                mutex_destroy(&buffer->mutex);
-                kfree(buffer);
-        }
+        struct configfs_buffer *buffer = filp->private_data;
+
+        module_put(buffer->owner);
+        if (buffer->page)
+                free_page((unsigned long)buffer->page);
+        mutex_destroy(&buffer->mutex);
+        kfree(buffer);
         return 0;
 }
 
 static int configfs_open_file(struct inode *inode, struct file *filp)
 {
-        return check_perm(inode, filp, CONFIGFS_ITEM_ATTR);
+        return __configfs_open_file(inode, filp, CONFIGFS_ITEM_ATTR);
 }
 
 static int configfs_open_bin_file(struct inode *inode, struct file *filp)
 {
-        return check_perm(inode, filp, CONFIGFS_ITEM_BIN_ATTR);
+        return __configfs_open_file(inode, filp, CONFIGFS_ITEM_BIN_ATTR);
 }
 
-static int configfs_release_bin_file(struct inode *inode, struct file *filp)
+static int configfs_release_bin_file(struct inode *inode, struct file *file)
 {
-        struct configfs_buffer *buffer = filp->private_data;
-        struct dentry *dentry = filp->f_path.dentry;
-        struct config_item *item = to_item(dentry->d_parent);
-        struct configfs_bin_attribute *bin_attr = to_bin_attr(dentry);
-        ssize_t len = 0;
-        int ret;
+        struct configfs_buffer *buffer = file->private_data;
 
         buffer->read_in_progress = false;
 
         if (buffer->write_in_progress) {
+                struct configfs_fragment *frag = to_frag(file);
                 buffer->write_in_progress = false;
 
-                len = bin_attr->write(item, buffer->bin_buffer,
-                                buffer->bin_buffer_size);
-
+                down_read(&frag->frag_sem);
+                if (!frag->frag_dead) {
+                        /* result of ->release() is ignored */
+                        buffer->bin_attr->write(buffer->item,
+                                        buffer->bin_buffer,
+                                        buffer->bin_buffer_size);
+                }
+                up_read(&frag->frag_sem);
                 /* vfree on NULL is safe */
                 vfree(buffer->bin_buffer);
                 buffer->bin_buffer = NULL;
@@ -489,10 +491,8 @@ static int configfs_release_bin_file(struct inode *inode, struct file *filp)
                 buffer->needs_read_fill = 1;
         }
 
-        ret = configfs_release(inode, filp);
-        if (len < 0)
-                return len;
-        return ret;
+        configfs_release(inode, file);
+        return 0;
 }
 
 
@@ -527,7 +527,7 @@ int configfs_create_file(struct config_item * item, const struct configfs_attrib
 
         inode_lock_nested(d_inode(dir), I_MUTEX_NORMAL);
         error = configfs_make_dirent(parent_sd, NULL, (void *) attr, mode,
-                                     CONFIGFS_ITEM_ATTR);
+                                     CONFIGFS_ITEM_ATTR, parent_sd->s_frag);
         inode_unlock(d_inode(dir));
 
         return error;
@@ -549,7 +549,7 @@ int configfs_create_bin_file(struct config_item *item,
 
         inode_lock_nested(dir->d_inode, I_MUTEX_NORMAL);
         error = configfs_make_dirent(parent_sd, NULL, (void *) bin_attr, mode,
-                                     CONFIGFS_ITEM_BIN_ATTR);
+                                     CONFIGFS_ITEM_BIN_ATTR, parent_sd->s_frag);
         inode_unlock(dir->d_inode);
 
         return error;
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 24bbe3cb7ad4..cfb48bd088e1 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -679,6 +679,13 @@ static void io_put_req(struct io_kiocb *req)
                 io_free_req(req);
 }
 
+static unsigned io_cqring_events(struct io_cq_ring *ring)
+{
+        /* See comment at the top of this file */
+        smp_rmb();
+        return READ_ONCE(ring->r.tail) - READ_ONCE(ring->r.head);
+}
+
 /*
  * Find and free completed poll iocbs
  */
@@ -771,7 +778,7 @@ static int io_do_iopoll(struct io_ring_ctx *ctx, unsigned int *nr_events,
 static int io_iopoll_getevents(struct io_ring_ctx *ctx, unsigned int *nr_events,
                                 long min)
 {
-        while (!list_empty(&ctx->poll_list)) {
+        while (!list_empty(&ctx->poll_list) && !need_resched()) {
                 int ret;
 
                 ret = io_do_iopoll(ctx, nr_events, min);
@@ -798,6 +805,12 @@ static void io_iopoll_reap_events(struct io_ring_ctx *ctx)
                 unsigned int nr_events = 0;
 
                 io_iopoll_getevents(ctx, &nr_events, 1);
+
+                /*
+                 * Ensure we allow local-to-the-cpu processing to take place,
+                 * in this case we need to ensure that we reap all events.
+                 */
+                cond_resched();
         }
         mutex_unlock(&ctx->uring_lock);
 }
@@ -805,11 +818,42 @@ static void io_iopoll_reap_events(struct io_ring_ctx *ctx)
 static int io_iopoll_check(struct io_ring_ctx *ctx, unsigned *nr_events,
                            long min)
 {
-        int ret = 0;
+        int iters, ret = 0;
 
+        /*
+         * We disallow the app entering submit/complete with polling, but we
+         * still need to lock the ring to prevent racing with polled issue
+         * that got punted to a workqueue.
+         */
+        mutex_lock(&ctx->uring_lock);
+
+        iters = 0;
         do {
                 int tmin = 0;
 
+                /*
+                 * Don't enter poll loop if we already have events pending.
+                 * If we do, we can potentially be spinning for commands that
+                 * already triggered a CQE (eg in error).
+                 */
+                if (io_cqring_events(ctx->cq_ring))
+                        break;
+
+                /*
+                 * If a submit got punted to a workqueue, we can have the
+                 * application entering polling for a command before it gets
+                 * issued. That app will hold the uring_lock for the duration
+                 * of the poll right here, so we need to take a breather every
+                 * now and then to ensure that the issue has a chance to add
+                 * the poll to the issued list. Otherwise we can spin here
+                 * forever, while the workqueue is stuck trying to acquire the
+                 * very same mutex.
+                 */
+                if (!(++iters & 7)) {
+                        mutex_unlock(&ctx->uring_lock);
+                        mutex_lock(&ctx->uring_lock);
+                }
+
                 if (*nr_events < min)
                         tmin = min - *nr_events;
 
@@ -819,6 +863,7 @@ static int io_iopoll_check(struct io_ring_ctx *ctx, unsigned *nr_events,
                 ret = 0;
         } while (min && !*nr_events && !need_resched());
 
+        mutex_unlock(&ctx->uring_lock);
         return ret;
 }
 
@@ -2280,15 +2325,7 @@ static int io_sq_thread(void *data)
                         unsigned nr_events = 0;
 
                         if (ctx->flags & IORING_SETUP_IOPOLL) {
-                                /*
-                                 * We disallow the app entering submit/complete
-                                 * with polling, but we still need to lock the
-                                 * ring to prevent racing with polled issue
-                                 * that got punted to a workqueue.
-                                 */
-                                mutex_lock(&ctx->uring_lock);
                                 io_iopoll_check(ctx, &nr_events, 0);
-                                mutex_unlock(&ctx->uring_lock);
                         } else {
                                 /*
                                  * Normal IO, just pretend everything completed.
@@ -2433,13 +2470,6 @@ static int io_ring_submit(struct io_ring_ctx *ctx, unsigned int to_submit)
         return submit;
 }
 
-static unsigned io_cqring_events(struct io_cq_ring *ring)
-{
-        /* See comment at the top of this file */
-        smp_rmb();
-        return READ_ONCE(ring->r.tail) - READ_ONCE(ring->r.head);
-}
-
 /*
  * Wait until events become available, if we don't already have some. The
  * application must reap them itself, as they reside on the shared cq ring.
@@ -3190,9 +3220,7 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,
                 min_complete = min(min_complete, ctx->cq_entries);
 
                 if (ctx->flags & IORING_SETUP_IOPOLL) {
-                        mutex_lock(&ctx->uring_lock);
                         ret = io_iopoll_check(ctx, &nr_events, min_complete);
-                        mutex_unlock(&ctx->uring_lock);
                 } else {
                         ret = io_cqring_wait(ctx, min_complete, sig, sigsz);
                 }
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 8d501093660f..0adfd8840110 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1487,7 +1487,7 @@ static int nfs_finish_open(struct nfs_open_context *ctx,
         if (S_ISREG(file->f_path.dentry->d_inode->i_mode))
                 nfs_file_set_open_context(file, ctx);
         else
-                err = -ESTALE;
+                err = -EOPENSTALE;
 out:
         return err;
 }
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 0cb442406168..222d7115db71 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -401,15 +401,21 @@ static void nfs_direct_read_completion(struct nfs_pgio_header *hdr)
         unsigned long bytes = 0;
         struct nfs_direct_req *dreq = hdr->dreq;
 
-        if (test_bit(NFS_IOHDR_REDO, &hdr->flags))
-                goto out_put;
-
         spin_lock(&dreq->lock);
-        if (test_bit(NFS_IOHDR_ERROR, &hdr->flags) && (hdr->good_bytes == 0))
+        if (test_bit(NFS_IOHDR_ERROR, &hdr->flags))
                 dreq->error = hdr->error;
-        else
+
+        if (test_bit(NFS_IOHDR_REDO, &hdr->flags)) {
+                spin_unlock(&dreq->lock);
+                goto out_put;
+        }
+
+        if (hdr->good_bytes != 0)
                 nfs_direct_good_bytes(dreq, hdr);
 
+        if (test_bit(NFS_IOHDR_EOF, &hdr->flags))
+                dreq->error = 0;
+
         spin_unlock(&dreq->lock);
 
         while (!list_empty(&hdr->pages)) {
@@ -782,16 +788,19 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)
         bool request_commit = false;
         struct nfs_page *req = nfs_list_entry(hdr->pages.next);
 
-        if (test_bit(NFS_IOHDR_REDO, &hdr->flags))
-                goto out_put;
-
         nfs_init_cinfo_from_dreq(&cinfo, dreq);
 
         spin_lock(&dreq->lock);
 
         if (test_bit(NFS_IOHDR_ERROR, &hdr->flags))
                 dreq->error = hdr->error;
-        if (dreq->error == 0) {
+
+        if (test_bit(NFS_IOHDR_REDO, &hdr->flags)) {
+                spin_unlock(&dreq->lock);
+                goto out_put;
+        }
+
+        if (hdr->good_bytes != 0) {
                 nfs_direct_good_bytes(dreq, hdr);
                 if (nfs_write_need_commit(hdr)) {
                         if (dreq->flags == NFS_ODIRECT_RESCHED_WRITES)
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index b04e20d28162..5657b7f2611f 100644
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -8,6 +8,7 @@
  */
 
 #include <linux/nfs_fs.h>
+#include <linux/nfs_mount.h>
 #include <linux/nfs_page.h>
 #include <linux/module.h>
 #include <linux/sched/mm.h>
@@ -928,7 +929,9 @@ retry:
         pgm = &pgio->pg_mirrors[0];
         pgm->pg_bsize = mirror->mirror_ds->ds_versions[0].rsize;
 
-        pgio->pg_maxretrans = io_maxretrans;
+        if (NFS_SERVER(pgio->pg_inode)->flags &
+                        (NFS_MOUNT_SOFT|NFS_MOUNT_SOFTERR))
+                pgio->pg_maxretrans = io_maxretrans;
         return;
 out_nolseg:
         if (pgio->pg_error < 0)
@@ -940,6 +943,7 @@ out_mds:
                         pgio->pg_lseg);
         pnfs_put_lseg(pgio->pg_lseg);
         pgio->pg_lseg = NULL;
+        pgio->pg_maxretrans = 0;
         nfs_pageio_reset_read_mds(pgio);
 }
 
@@ -1000,7 +1004,9 @@ retry:
                 pgm->pg_bsize = mirror->mirror_ds->ds_versions[0].wsize;
         }
 
-        pgio->pg_maxretrans = io_maxretrans;
+        if (NFS_SERVER(pgio->pg_inode)->flags &
+                        (NFS_MOUNT_SOFT|NFS_MOUNT_SOFTERR))
+                pgio->pg_maxretrans = io_maxretrans;
         return;
 
 out_mds:
@@ -1010,6 +1016,7 @@ out_mds:
                         pgio->pg_lseg);
         pnfs_put_lseg(pgio->pg_lseg);
         pgio->pg_lseg = NULL;
+        pgio->pg_maxretrans = 0;
         nfs_pageio_reset_write_mds(pgio);
 }
 
@@ -1148,8 +1155,6 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task,
                 break;
         case -NFS4ERR_RETRY_UNCACHED_REP:
                 break;
-        case -EAGAIN:
-                return -NFS4ERR_RESET_TO_PNFS;
         /* Invalidate Layout errors */
         case -NFS4ERR_PNFS_NO_LAYOUT:
         case -ESTALE:           /* mapped NFS4ERR_STALE */
@@ -1210,7 +1215,6 @@ static int ff_layout_async_handle_error_v3(struct rpc_task *task,
         case -EBADHANDLE:
         case -ELOOP:
         case -ENOSPC:
-        case -EAGAIN:
                 break;
         case -EJUKEBOX:
                 nfs_inc_stats(lseg->pls_layout->plh_inode, NFSIOS_DELAY);
@@ -1445,16 +1449,6 @@ static void ff_layout_read_prepare_v4(struct rpc_task *task, void *data)
         ff_layout_read_prepare_common(task, hdr);
 }
 
-static void
-ff_layout_io_prepare_transmit(struct rpc_task *task,
-                void *data)
-{
-        struct nfs_pgio_header *hdr = data;
-
-        if (!pnfs_is_valid_lseg(hdr->lseg))
-                rpc_exit(task, -EAGAIN);
-}
-
 static void ff_layout_read_call_done(struct rpc_task *task, void *data)
 {
         struct nfs_pgio_header *hdr = data;
@@ -1740,7 +1734,6 @@ static void ff_layout_commit_release(void *data)
 
 static const struct rpc_call_ops ff_layout_read_call_ops_v3 = {
         .rpc_call_prepare = ff_layout_read_prepare_v3,
-        .rpc_call_prepare_transmit = ff_layout_io_prepare_transmit,
         .rpc_call_done = ff_layout_read_call_done,
         .rpc_count_stats = ff_layout_read_count_stats,
         .rpc_release = ff_layout_read_release,
@@ -1748,7 +1741,6 @@ static const struct rpc_call_ops ff_layout_read_call_ops_v3 = {
 
 static const struct rpc_call_ops ff_layout_read_call_ops_v4 = {
         .rpc_call_prepare = ff_layout_read_prepare_v4,
-        .rpc_call_prepare_transmit = ff_layout_io_prepare_transmit,
         .rpc_call_done = ff_layout_read_call_done,
         .rpc_count_stats = ff_layout_read_count_stats,
         .rpc_release = ff_layout_read_release,
@@ -1756,7 +1748,6 @@ static const struct rpc_call_ops ff_layout_read_call_ops_v4 = {
 
 static const struct rpc_call_ops ff_layout_write_call_ops_v3 = {
         .rpc_call_prepare = ff_layout_write_prepare_v3,
-        .rpc_call_prepare_transmit = ff_layout_io_prepare_transmit,
         .rpc_call_done = ff_layout_write_call_done,
         .rpc_count_stats = ff_layout_write_count_stats,
         .rpc_release = ff_layout_write_release,
@@ -1764,7 +1755,6 @@ static const struct rpc_call_ops ff_layout_write_call_ops_v3 = {
 
 static const struct rpc_call_ops ff_layout_write_call_ops_v4 = {
         .rpc_call_prepare = ff_layout_write_prepare_v4,
-        .rpc_call_prepare_transmit = ff_layout_io_prepare_transmit,
         .rpc_call_done = ff_layout_write_call_done,
         .rpc_count_stats = ff_layout_write_count_stats,
         .rpc_release = ff_layout_write_release,
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 8a1758200b57..2a03bfeec10a 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1403,12 +1403,22 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat
         if (NFS_PROTO(inode)->have_delegation(inode, FMODE_READ))
                 return 0;
 
+        if (!(fattr->valid & NFS_ATTR_FATTR_FILEID)) {
+                /* Only a mounted-on-fileid? Just exit */
+                if (fattr->valid & NFS_ATTR_FATTR_MOUNTED_ON_FILEID)
+                        return 0;
         /* Has the inode gone and changed behind our back? */
-        if ((fattr->valid & NFS_ATTR_FATTR_FILEID) && nfsi->fileid != fattr->fileid)
+        } else if (nfsi->fileid != fattr->fileid) {
+                /* Is this perhaps the mounted-on fileid? */
+                if ((fattr->valid & NFS_ATTR_FATTR_MOUNTED_ON_FILEID) &&
+                    nfsi->fileid == fattr->mounted_on_fileid)
+                        return 0;
                 return -ESTALE;
+        }
         if ((fattr->valid & NFS_ATTR_FATTR_TYPE) && (inode->i_mode & S_IFMT) != (fattr->mode & S_IFMT))
                 return -ESTALE;
 
+
         if (!nfs_file_has_buffered_writers(nfsi)) {
                 /* Verify a few of the more important attributes */
                 if ((fattr->valid & NFS_ATTR_FATTR_CHANGE) != 0 && !inode_eq_iversion_raw(inode, fattr->change_attr))
@@ -1768,18 +1778,6 @@ int nfs_post_op_update_inode_force_wcc(struct inode *inode, struct nfs_fattr *fa
 EXPORT_SYMBOL_GPL(nfs_post_op_update_inode_force_wcc);
 
 
-static inline bool nfs_fileid_valid(struct nfs_inode *nfsi,
-                                    struct nfs_fattr *fattr)
-{
-        bool ret1 = true, ret2 = true;
-
-        if (fattr->valid & NFS_ATTR_FATTR_FILEID)
-                ret1 = (nfsi->fileid == fattr->fileid);
-        if (fattr->valid & NFS_ATTR_FATTR_MOUNTED_ON_FILEID)
-                ret2 = (nfsi->fileid == fattr->mounted_on_fileid);
-        return ret1 || ret2;
-}
-
 /*
  * Many nfs protocol calls return the new file attributes after
  * an operation.  Here we update the inode to reflect the state
@@ -1810,7 +1808,16 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
                         nfs_display_fhandle_hash(NFS_FH(inode)),
                         atomic_read(&inode->i_count), fattr->valid);
 
-        if (!nfs_fileid_valid(nfsi, fattr)) {
+        if (!(fattr->valid & NFS_ATTR_FATTR_FILEID)) {
+                /* Only a mounted-on-fileid? Just exit */
+                if (fattr->valid & NFS_ATTR_FATTR_MOUNTED_ON_FILEID)
+                        return 0;
+        /* Has the inode gone and changed behind our back? */
+        } else if (nfsi->fileid != fattr->fileid) {
+                /* Is this perhaps the mounted-on fileid? */
+                if ((fattr->valid & NFS_ATTR_FATTR_MOUNTED_ON_FILEID) &&
+                    nfsi->fileid == fattr->mounted_on_fileid)
+                        return 0;
                 printk(KERN_ERR "NFS: server %s error: fileid changed\n"
                         "fsid %s: expected fileid 0x%Lx, got 0x%Lx\n",
                         NFS_SERVER(inode)->nfs_client->cl_hostname,
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index a2346a2f8361..e64f810223be 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -775,3 +775,13 @@ static inline bool nfs_error_is_fatal(int err)
         }
 }
 
+static inline bool nfs_error_is_fatal_on_server(int err)
+{
+        switch (err) {
+        case 0:
+        case -ERESTARTSYS:
+        case -EINTR:
+                return false;
+        }
+        return nfs_error_is_fatal(err);
+}
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index 96db471ca2e5..339663d04bf8 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -73,13 +73,13 @@ nfs4_file_open(struct inode *inode, struct file *filp)
         if (IS_ERR(inode)) {
                 err = PTR_ERR(inode);
                 switch (err) {
-                case -EPERM:
-                case -EACCES:
-                case -EDQUOT:
-                case -ENOSPC:
-                case -EROFS:
-                        goto out_put_ctx;
                 default:
+                        goto out_put_ctx;
+                case -ENOENT:
+                case -ESTALE:
+                case -EISDIR:
+                case -ENOTDIR:
+                case -ELOOP:
                         goto out_drop;
                 }
         }
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index ed4e1b07447b..20b3717cd7ca 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -590,7 +590,7 @@ static void nfs_pgio_rpcsetup(struct nfs_pgio_header *hdr,
         }
 
         hdr->res.fattr   = &hdr->fattr;
-        hdr->res.count   = count;
+        hdr->res.count   = 0;
         hdr->res.eof     = 0;
         hdr->res.verf    = &hdr->verf;
         nfs_fattr_init(&hdr->fattr);
@@ -1251,20 +1251,23 @@ static void nfs_pageio_complete_mirror(struct nfs_pageio_descriptor *desc,
 int nfs_pageio_resend(struct nfs_pageio_descriptor *desc,
                       struct nfs_pgio_header *hdr)
 {
-        LIST_HEAD(failed);
+        LIST_HEAD(pages);
 
         desc->pg_io_completion = hdr->io_completion;
         desc->pg_dreq = hdr->dreq;
-        while (!list_empty(&hdr->pages)) {
-                struct nfs_page *req = nfs_list_entry(hdr->pages.next);
+        list_splice_init(&hdr->pages, &pages);
+        while (!list_empty(&pages)) {
+                struct nfs_page *req = nfs_list_entry(pages.next);
 
                 if (!nfs_pageio_add_request(desc, req))
-                        nfs_list_move_request(req, &failed);
+                        break;
         }
         nfs_pageio_complete(desc);
-        if (!list_empty(&failed)) {
-                list_move(&failed, &hdr->pages);
-                return desc->pg_error < 0 ? desc->pg_error : -EIO;
+        if (!list_empty(&pages)) {
+                int err = desc->pg_error < 0 ? desc->pg_error : -EIO;
+                hdr->completion_ops->error_cleanup(&pages, err);
+                nfs_set_pgio_error(hdr, err, hdr->io_start);
+                return err;
         }
         return 0;
 }
diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c
index c0046c348910..82af4809b869 100644
--- a/fs/nfs/pnfs_nfs.c
+++ b/fs/nfs/pnfs_nfs.c
@@ -627,11 +627,16 @@ static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv,
                         /* Add this address as an alias */
                         rpc_clnt_add_xprt(clp->cl_rpcclient, &xprt_args,
                                         rpc_clnt_test_and_add_xprt, NULL);
-                } else
-                        clp = get_v3_ds_connect(mds_srv,
-                                        (struct sockaddr *)&da->da_addr,
-                                        da->da_addrlen, IPPROTO_TCP,
-                                        timeo, retrans);
+                        continue;
+                }
+                clp = get_v3_ds_connect(mds_srv,
+                                (struct sockaddr *)&da->da_addr,
+                                da->da_addrlen, IPPROTO_TCP,
+                                timeo, retrans);
+                if (IS_ERR(clp))
+                        continue;
+                clp->cl_rpcclient->cl_softerr = 0;
+                clp->cl_rpcclient->cl_softrtry = 0;
         }
 
         if (IS_ERR(clp)) {
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 5552fa8b6e12..0f7288b94633 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -594,7 +594,8 @@ static int nfs_read_done(struct rpc_task *task, struct nfs_pgio_header *hdr)
                 /* Emulate the eof flag, which isn't normally needed in NFSv2
                  * as it is guaranteed to always return the file attributes
                  */
-                if (hdr->args.offset + hdr->res.count >= hdr->res.fattr->size)
+                if ((hdr->res.count == 0 && hdr->args.count > 0) ||
+                    hdr->args.offset + hdr->res.count >= hdr->res.fattr->size)
                         hdr->res.eof = 1;
         }
         return 0;
@@ -615,8 +616,10 @@ static int nfs_proc_pgio_rpc_prepare(struct rpc_task *task,
 
 static int nfs_write_done(struct rpc_task *task, struct nfs_pgio_header *hdr)
 {
-        if (task->tk_status >= 0)
+        if (task->tk_status >= 0) {
+                hdr->res.count = hdr->args.count;
                 nfs_writeback_update_inode(hdr);
+        }
         return 0;
 }
 
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index c19841c82b6a..cfe0b586eadd 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -91,19 +91,25 @@ void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio)
 }
 EXPORT_SYMBOL_GPL(nfs_pageio_reset_read_mds);
 
-static void nfs_readpage_release(struct nfs_page *req)
+static void nfs_readpage_release(struct nfs_page *req, int error)
 {
         struct inode *inode = d_inode(nfs_req_openctx(req)->dentry);
+        struct page *page = req->wb_page;
 
         dprintk("NFS: read done (%s/%llu %d@%lld)\n", inode->i_sb->s_id,
                 (unsigned long long)NFS_FILEID(inode), req->wb_bytes,
                 (long long)req_offset(req));
 
+        if (nfs_error_is_fatal_on_server(error) && error != -ETIMEDOUT)
+                SetPageError(page);
         if (nfs_page_group_sync_on_bit(req, PG_UNLOCKPAGE)) {
-                if (PageUptodate(req->wb_page))
-                        nfs_readpage_to_fscache(inode, req->wb_page, 0);
+                struct address_space *mapping = page_file_mapping(page);
 
-                unlock_page(req->wb_page);
+                if (PageUptodate(page))
+                        nfs_readpage_to_fscache(inode, page, 0);
+                else if (!PageError(page) && !PagePrivate(page))
+                        generic_error_remove_page(mapping, page);
+                unlock_page(page);
         }
         nfs_release_request(req);
 }
@@ -131,7 +137,7 @@ int nfs_readpage_async(struct nfs_open_context *ctx, struct inode *inode,
                              &nfs_async_read_completion_ops);
         if (!nfs_pageio_add_request(&pgio, new)) {
                 nfs_list_remove_request(new);
-                nfs_readpage_release(new);
+                nfs_readpage_release(new, pgio.pg_error);
         }
         nfs_pageio_complete(&pgio);
 
@@ -153,6 +159,7 @@ static void nfs_page_group_set_uptodate(struct nfs_page *req)
 static void nfs_read_completion(struct nfs_pgio_header *hdr)
 {
         unsigned long bytes = 0;
+        int error;
 
         if (test_bit(NFS_IOHDR_REDO, &hdr->flags))
                 goto out;
@@ -179,14 +186,19 @@ static void nfs_read_completion(struct nfs_pgio_header *hdr)
                                 zero_user_segment(page, start, end);
                         }
                 }
+                error = 0;
                 bytes += req->wb_bytes;
                 if (test_bit(NFS_IOHDR_ERROR, &hdr->flags)) {
                         if (bytes <= hdr->good_bytes)
                                 nfs_page_group_set_uptodate(req);
+                        else {
+                                error = hdr->error;
+                                xchg(&nfs_req_openctx(req)->error, error);
+                        }
                 } else
                         nfs_page_group_set_uptodate(req);
                 nfs_list_remove_request(req);
-                nfs_readpage_release(req);
+                nfs_readpage_release(req, error);
         }
 out:
         hdr->release(hdr);
@@ -213,7 +225,7 @@ nfs_async_read_error(struct list_head *head, int error)
         while (!list_empty(head)) {
                 req = nfs_list_entry(head->next);
                 nfs_list_remove_request(req);
-                nfs_readpage_release(req);
+                nfs_readpage_release(req, error);
         }
 }
 
@@ -337,8 +349,13 @@ int nfs_readpage(struct file *file, struct page *page)
                         goto out;
         }
 
+        xchg(&ctx->error, 0);
         error = nfs_readpage_async(ctx, inode, page);
-
+        if (!error) {
+                error = wait_on_page_locked_killable(page);
+                if (!PageUptodate(page) && !error)
+                        error = xchg(&ctx->error, 0);
+        }
 out:
         put_nfs_open_context(ctx);
         return error;
@@ -372,8 +389,8 @@ readpage_async_filler(void *data, struct page *page)
                 zero_user_segment(page, len, PAGE_SIZE);
         if (!nfs_pageio_add_request(desc->pgio, new)) {
                 nfs_list_remove_request(new);
-                nfs_readpage_release(new);
                 error = desc->pgio->pg_error;
+                nfs_readpage_release(new, error);
                 goto out;
         }
         return 0;
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 92d9cadc6102..85ca49549b39 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -57,6 +57,7 @@ static const struct rpc_call_ops nfs_commit_ops;
 static const struct nfs_pgio_completion_ops nfs_async_write_completion_ops;
 static const struct nfs_commit_completion_ops nfs_commit_completion_ops;
 static const struct nfs_rw_ops nfs_rw_write_ops;
+static void nfs_inode_remove_request(struct nfs_page *req);
 static void nfs_clear_request_commit(struct nfs_page *req);
 static void nfs_init_cinfo_from_inode(struct nfs_commit_info *cinfo,
                                       struct inode *inode);
@@ -591,23 +592,13 @@ release_request:
 
 static void nfs_write_error(struct nfs_page *req, int error)
 {
+        nfs_set_pageerror(page_file_mapping(req->wb_page));
         nfs_mapping_set_error(req->wb_page, error);
+        nfs_inode_remove_request(req);
         nfs_end_page_writeback(req);
         nfs_release_request(req);
 }
 
-static bool
-nfs_error_is_fatal_on_server(int err)
-{
-        switch (err) {
-        case 0:
-        case -ERESTARTSYS:
-        case -EINTR:
-                return false;
-        }
-        return nfs_error_is_fatal(err);
-}
-
 /*
  * Find an associated nfs write request, and prepare to flush it out
  * May return an error if the user signalled nfs_wait_on_request().
@@ -615,7 +606,6 @@ nfs_error_is_fatal_on_server(int err)
 static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio,
                                 struct page *page)
 {
-        struct address_space *mapping;
         struct nfs_page *req;
         int ret = 0;
 
@@ -630,12 +620,11 @@ static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio,
         WARN_ON_ONCE(test_bit(PG_CLEAN, &req->wb_flags));
 
         /* If there is a fatal error that covers this write, just exit */
-        ret = 0;
-        mapping = page_file_mapping(page);
-        if (test_bit(AS_ENOSPC, &mapping->flags) ||
-            test_bit(AS_EIO, &mapping->flags))
+        ret = pgio->pg_error;
+        if (nfs_error_is_fatal_on_server(ret))
                 goto out_launder;
 
+        ret = 0;
         if (!nfs_pageio_add_request(pgio, req)) {
                 ret = pgio->pg_error;
                 /*
@@ -647,6 +636,7 @@ static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio,
                 } else
                         ret = -EAGAIN;
                 nfs_redirty_request(req);
+                pgio->pg_error = 0;
         } else
                 nfs_add_stats(page_file_mapping(page)->host,
                                 NFSIOS_WRITEPAGES, 1);
@@ -666,7 +656,7 @@ static int nfs_do_writepage(struct page *page, struct writeback_control *wbc,
         ret = nfs_page_async_flush(pgio, page);
         if (ret == -EAGAIN) {
                 redirty_page_for_writepage(wbc, page);
-                ret = 0;
+                ret = AOP_WRITEPAGE_ACTIVATE;
         }
         return ret;
 }
@@ -685,10 +675,11 @@ static int nfs_writepage_locked(struct page *page,
         nfs_pageio_init_write(&pgio, inode, 0,
                                 false, &nfs_async_write_completion_ops);
         err = nfs_do_writepage(page, wbc, &pgio);
+        pgio.pg_error = 0;
         nfs_pageio_complete(&pgio);
         if (err < 0)
                 return err;
-        if (pgio.pg_error < 0)
+        if (nfs_error_is_fatal(pgio.pg_error))
                 return pgio.pg_error;
         return 0;
 }
@@ -698,7 +689,8 @@ int nfs_writepage(struct page *page, struct writeback_control *wbc)
         int ret;
 
         ret = nfs_writepage_locked(page, wbc);
-        unlock_page(page);
+        if (ret != AOP_WRITEPAGE_ACTIVATE)
+                unlock_page(page);
         return ret;
 }
 
@@ -707,7 +699,8 @@ static int nfs_writepages_callback(struct page *page, struct writeback_control *
         int ret;
 
         ret = nfs_do_writepage(page, wbc, data);
-        unlock_page(page);
+        if (ret != AOP_WRITEPAGE_ACTIVATE)
+                unlock_page(page);
         return ret;
 }
 
@@ -733,13 +726,14 @@ int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc)
                                 &nfs_async_write_completion_ops);
         pgio.pg_io_completion = ioc;
         err = write_cache_pages(mapping, wbc, nfs_writepages_callback, &pgio);
+        pgio.pg_error = 0;
         nfs_pageio_complete(&pgio);
         nfs_io_completion_put(ioc);
 
         if (err < 0)
                 goto out_err;
         err = pgio.pg_error;
-        if (err < 0)
+        if (nfs_error_is_fatal(err))
                 goto out_err;
         return 0;
 out_err:
diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
index 26ad75ae2be0..96352ab7bd81 100644
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@ -571,7 +571,7 @@ nfsd_cache_append(struct svc_rqst *rqstp, struct kvec *data)
  */
 static int nfsd_reply_cache_stats_show(struct seq_file *m, void *v)
 {
-        struct nfsd_net *nn = v;
+        struct nfsd_net *nn = m->private;
 
         seq_printf(m, "max entries:           %u\n", nn->max_drc_entries);
         seq_printf(m, "num entries:           %u\n",
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 13c548733860..3cf4f6aa48d6 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1171,13 +1171,17 @@ static struct inode *nfsd_get_inode(struct super_block *sb, umode_t mode)
         return inode;
 }
 
-static int __nfsd_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
+static int __nfsd_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode, struct nfsdfs_client *ncl)
 {
         struct inode *inode;
 
         inode = nfsd_get_inode(dir->i_sb, mode);
         if (!inode)
                 return -ENOMEM;
+        if (ncl) {
+                inode->i_private = ncl;
+                kref_get(&ncl->cl_ref);
+        }
         d_add(dentry, inode);
         inc_nlink(dir);
         fsnotify_mkdir(dir, dentry);
@@ -1194,17 +1198,14 @@ static struct dentry *nfsd_mkdir(struct dentry *parent, struct nfsdfs_client *nc
         dentry = d_alloc_name(parent, name);
         if (!dentry)
                 goto out_err;
-        ret = __nfsd_mkdir(d_inode(parent), dentry, S_IFDIR | 0600);
+        ret = __nfsd_mkdir(d_inode(parent), dentry, S_IFDIR | 0600, ncl);
         if (ret)
                 goto out_err;
-        if (ncl) {
-                d_inode(dentry)->i_private = ncl;
-                kref_get(&ncl->cl_ref);
-        }
 out:
         inode_unlock(dir);
         return dentry;
 out_err:
+        dput(dentry);
         dentry = ERR_PTR(ret);
         goto out;
 }
@@ -1214,11 +1215,9 @@ static void clear_ncl(struct inode *inode)
         struct nfsdfs_client *ncl = inode->i_private;
 
         inode->i_private = NULL;
-        synchronize_rcu();
         kref_put(&ncl->cl_ref, ncl->cl_release);
 }
 
-
 static struct nfsdfs_client *__get_nfsdfs_client(struct inode *inode)
 {
         struct nfsdfs_client *nc = inode->i_private;
@@ -1232,9 +1231,9 @@ struct nfsdfs_client *get_nfsdfs_client(struct inode *inode)
 {
         struct nfsdfs_client *nc;
 
-        rcu_read_lock();
+        inode_lock_shared(inode);
         nc = __get_nfsdfs_client(inode);
-        rcu_read_unlock();
+        inode_unlock_shared(inode);
         return nc;
 }
 /* from __rpc_unlink */
diff --git a/fs/read_write.c b/fs/read_write.c
index 1f5088dec566..5bbf587f5bc1 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1811,10 +1811,7 @@ static int generic_remap_check_len(struct inode *inode_in,
         return (remap_flags & REMAP_FILE_DEDUP) ? -EBADE : -EINVAL;
 }
 
-/*
- * Read a page's worth of file data into the page cache.  Return the page
- * locked.
- */
+/* Read a page's worth of file data into the page cache. */
 static struct page *vfs_dedupe_get_page(struct inode *inode, loff_t offset)
 {
         struct page *page;
@@ -1826,11 +1823,33 @@ static struct page *vfs_dedupe_get_page(struct inode *inode, loff_t offset)
                 put_page(page);
                 return ERR_PTR(-EIO);
         }
-        lock_page(page);
         return page;
 }
 
 /*
+ * Lock two pages, ensuring that we lock in offset order if the pages are from
+ * the same file.
+ */
+static void vfs_lock_two_pages(struct page *page1, struct page *page2)
+{
+        /* Always lock in order of increasing index. */
+        if (page1->index > page2->index)
+                swap(page1, page2);
+
+        lock_page(page1);
+        if (page1 != page2)
+                lock_page(page2);
+}
+
+/* Unlock two pages, being careful not to unlock the same page twice. */
+static void vfs_unlock_two_pages(struct page *page1, struct page *page2)
+{
+        unlock_page(page1);
+        if (page1 != page2)
+                unlock_page(page2);
+}
+
+/*
  * Compare extents of two files to see if they are the same.
  * Caller must have locked both inodes to prevent write races.
  */
@@ -1867,10 +1886,24 @@ static int vfs_dedupe_file_range_compare(struct inode *src, loff_t srcoff,
                 dest_page = vfs_dedupe_get_page(dest, destoff);
                 if (IS_ERR(dest_page)) {
                         error = PTR_ERR(dest_page);
-                        unlock_page(src_page);
                         put_page(src_page);
                         goto out_error;
                 }
+
+                vfs_lock_two_pages(src_page, dest_page);
+
+                /*
+                 * Now that we've locked both pages, make sure they're still
+                 * mapped to the file data we're interested in.  If not,
+                 * someone is invalidating pages on us and we lose.
+                 */
+                if (!PageUptodate(src_page) || !PageUptodate(dest_page) ||
+                    src_page->mapping != src->i_mapping ||
+                    dest_page->mapping != dest->i_mapping) {
+                        same = false;
+                        goto unlock;
+                }
+
                 src_addr = kmap_atomic(src_page);
                 dest_addr = kmap_atomic(dest_page);
 
@@ -1882,8 +1915,8 @@ static int vfs_dedupe_file_range_compare(struct inode *src, loff_t srcoff,
 
                 kunmap_atomic(dest_addr);
                 kunmap_atomic(src_addr);
-                unlock_page(dest_page);
-                unlock_page(src_page);
+unlock:
+                vfs_unlock_two_pages(src_page, dest_page);
                 put_page(dest_page);
                 put_page(src_page);
 
diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c
index 80d7301ab76d..c0b84e960b20 100644
--- a/fs/ubifs/budget.c
+++ b/fs/ubifs/budget.c
@@ -51,7 +51,7 @@
 static void shrink_liability(struct ubifs_info *c, int nr_to_write)
 {
         down_read(&c->vfs_sb->s_umount);
-        writeback_inodes_sb(c->vfs_sb, WB_REASON_FS_FREE_SPACE);
+        writeback_inodes_sb_nr(c->vfs_sb, nr_to_write, WB_REASON_FS_FREE_SPACE);
         up_read(&c->vfs_sb->s_umount);
 }
 
diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c
index b52624e28fa1..3b4b4114f208 100644
--- a/fs/ubifs/orphan.c
+++ b/fs/ubifs/orphan.c
@@ -129,7 +129,6 @@ static void __orphan_drop(struct ubifs_info *c, struct ubifs_orphan *o)
 static void orphan_delete(struct ubifs_info *c, struct ubifs_orphan *orph)
 {
         if (orph->del) {
-                spin_unlock(&c->orphan_lock);
                 dbg_gen("deleted twice ino %lu", orph->inum);
                 return;
         }
@@ -138,7 +137,6 @@ static void orphan_delete(struct ubifs_info *c, struct ubifs_orphan *orph)
                 orph->del = 1;
                 orph->dnext = c->orph_dnext;
                 c->orph_dnext = orph;
-                spin_unlock(&c->orphan_lock);
                 dbg_gen("delete later ino %lu", orph->inum);
                 return;
         }
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 2c0803b0ac3a..8c1d571334bc 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -609,6 +609,10 @@ static int init_constants_early(struct ubifs_info *c)
         c->max_bu_buf_len = UBIFS_MAX_BULK_READ * UBIFS_MAX_DATA_NODE_SZ;
         if (c->max_bu_buf_len > c->leb_size)
                 c->max_bu_buf_len = c->leb_size;
+
+        /* Log is ready, preserve one LEB for commits. */
+        c->min_log_bytes = c->leb_size;
+
         return 0;
 }
 
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index ccbdbd62f0d8..fe6d804a38dc 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -880,6 +880,7 @@ static int userfaultfd_release(struct inode *inode, struct file *file)
         /* len == 0 means wake all */
         struct userfaultfd_wake_range range = { .len = 0, };
         unsigned long new_flags;
+        bool still_valid;
 
         WRITE_ONCE(ctx->released, true);
 
@@ -895,8 +896,7 @@ static int userfaultfd_release(struct inode *inode, struct file *file)
          * taking the mmap_sem for writing.
          */
         down_write(&mm->mmap_sem);
-        if (!mmget_still_valid(mm))
-                goto skip_mm;
+        still_valid = mmget_still_valid(mm);
         prev = NULL;
         for (vma = mm->mmap; vma; vma = vma->vm_next) {
                 cond_resched();
@@ -907,19 +907,20 @@ static int userfaultfd_release(struct inode *inode, struct file *file)
                         continue;
                 }
                 new_flags = vma->vm_flags & ~(VM_UFFD_MISSING | VM_UFFD_WP);
-                prev = vma_merge(mm, prev, vma->vm_start, vma->vm_end,
-                                 new_flags, vma->anon_vma,
-                                 vma->vm_file, vma->vm_pgoff,
-                                 vma_policy(vma),
-                                 NULL_VM_UFFD_CTX);
-                if (prev)
-                        vma = prev;
-                else
-                        prev = vma;
+                if (still_valid) {
+                        prev = vma_merge(mm, prev, vma->vm_start, vma->vm_end,
+                                         new_flags, vma->anon_vma,
+                                         vma->vm_file, vma->vm_pgoff,
+                                         vma_policy(vma),
+                                         NULL_VM_UFFD_CTX);
+                        if (prev)
+                                vma = prev;
+                        else
+                                prev = vma;
+                }
                 vma->vm_flags = new_flags;
                 vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;
         }
-skip_mm:
         up_write(&mm->mmap_sem);
         mmput(mm);
 wakeup:
diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
index 7fcf7569743f..7bd7534f5051 100644
--- a/fs/xfs/xfs_ioctl32.c
+++ b/fs/xfs/xfs_ioctl32.c
@@ -547,63 +547,12 @@ xfs_file_compat_ioctl(
         struct inode            *inode = file_inode(filp);
         struct xfs_inode        *ip = XFS_I(inode);
         struct xfs_mount        *mp = ip->i_mount;
-        void                    __user *arg = (void __user *)p;
+        void                    __user *arg = compat_ptr(p);
         int                     error;
 
         trace_xfs_file_compat_ioctl(ip);
 
         switch (cmd) {
-        /* No size or alignment issues on any arch */
-        case XFS_IOC_DIOINFO:
-        case XFS_IOC_FSGEOMETRY_V4:
-        case XFS_IOC_FSGEOMETRY:
-        case XFS_IOC_AG_GEOMETRY:
-        case XFS_IOC_FSGETXATTR:
-        case XFS_IOC_FSSETXATTR:
-        case XFS_IOC_FSGETXATTRA:
-        case XFS_IOC_FSSETDM:
-        case XFS_IOC_GETBMAP:
-        case XFS_IOC_GETBMAPA:
-        case XFS_IOC_GETBMAPX:
-        case XFS_IOC_FSCOUNTS:
-        case XFS_IOC_SET_RESBLKS:
-        case XFS_IOC_GET_RESBLKS:
-        case XFS_IOC_FSGROWFSLOG:
-        case XFS_IOC_GOINGDOWN:
-        case XFS_IOC_ERROR_INJECTION:
-        case XFS_IOC_ERROR_CLEARALL:
-        case FS_IOC_GETFSMAP:
-        case XFS_IOC_SCRUB_METADATA:
-        case XFS_IOC_BULKSTAT:
-        case XFS_IOC_INUMBERS:
-                return xfs_file_ioctl(filp, cmd, p);
-#if !defined(BROKEN_X86_ALIGNMENT) || defined(CONFIG_X86_X32)
-        /*
-         * These are handled fine if no alignment issues.  To support x32
-         * which uses native 64-bit alignment we must emit these cases in
-         * addition to the ia-32 compat set below.
-         */
-        case XFS_IOC_ALLOCSP:
-        case XFS_IOC_FREESP:
-        case XFS_IOC_RESVSP:
-        case XFS_IOC_UNRESVSP:
-        case XFS_IOC_ALLOCSP64:
-        case XFS_IOC_FREESP64:
-        case XFS_IOC_RESVSP64:
-        case XFS_IOC_UNRESVSP64:
-        case XFS_IOC_FSGEOMETRY_V1:
-        case XFS_IOC_FSGROWFSDATA:
-        case XFS_IOC_FSGROWFSRT:
-        case XFS_IOC_ZERO_RANGE:
-#ifdef CONFIG_X86_X32
-        /*
-         * x32 special: this gets a different cmd number from the ia-32 compat
-         * case below; the associated data will match native 64-bit alignment.
-         */
-        case XFS_IOC_SWAPEXT:
-#endif
-                return xfs_file_ioctl(filp, cmd, p);
-#endif
 #if defined(BROKEN_X86_ALIGNMENT)
         case XFS_IOC_ALLOCSP_32:
         case XFS_IOC_FREESP_32:
@@ -705,6 +654,7 @@ xfs_file_compat_ioctl(
         case XFS_IOC_FSSETDM_BY_HANDLE_32:
                 return xfs_compat_fssetdm_by_handle(filp, arg);
         default:
-                return -ENOIOCTLCMD;
+                /* try the native version */
+                return xfs_file_ioctl(filp, cmd, (unsigned long)arg);
         }
 }
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index ff3c1fae5357..fe285d123d69 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -793,6 +793,7 @@ xfs_setattr_nonsize(
 
 out_cancel:
         xfs_trans_cancel(tp);
+        xfs_iunlock(ip, XFS_ILOCK_EXCL);
 out_dqrele:
         xfs_qm_dqrele(udqp);
         xfs_qm_dqrele(gdqp);
diff --git a/fs/xfs/xfs_pnfs.c b/fs/xfs/xfs_pnfs.c
index 0c954cad7449..a339bd5fa260 100644
--- a/fs/xfs/xfs_pnfs.c
+++ b/fs/xfs/xfs_pnfs.c
@@ -32,7 +32,7 @@ xfs_break_leased_layouts(
         struct xfs_inode        *ip = XFS_I(inode);
         int                     error;
 
-        while ((error = break_layout(inode, false) == -EWOULDBLOCK)) {
+        while ((error = break_layout(inode, false)) == -EWOULDBLOCK) {
                 xfs_iunlock(ip, *iolock);
                 *did_unlock = true;
                 error = break_layout(inode, true);
diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index c4ec7afd1170..edbe37b7f636 100644
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -1190,11 +1190,11 @@ xfs_reflink_remap_blocks(
 }
 
 /*
- * Grab the exclusive iolock for a data copy from src to dest, making
- * sure to abide vfs locking order (lowest pointer value goes first) and
- * breaking the pnfs layout leases on dest before proceeding.  The loop
- * is needed because we cannot call the blocking break_layout() with the
- * src iolock held, and therefore have to back out both locks.
+ * Grab the exclusive iolock for a data copy from src to dest, making sure to
+ * abide vfs locking order (lowest pointer value goes first) and breaking the
+ * layout leases before proceeding.  The loop is needed because we cannot call
+ * the blocking break_layout() with the iolocks held, and therefore have to
+ * back out both locks.
  */
 static int
 xfs_iolock_two_inodes_and_break_layout(
@@ -1203,33 +1203,44 @@ xfs_iolock_two_inodes_and_break_layout(
 {
         int                     error;
 
-retry:
-        if (src < dest) {
-                inode_lock_shared(src);
-                inode_lock_nested(dest, I_MUTEX_NONDIR2);
-        } else {
-                /* src >= dest */
-                inode_lock(dest);
-        }
+        if (src > dest)
+                swap(src, dest);
 
-        error = break_layout(dest, false);
-        if (error == -EWOULDBLOCK) {
-                inode_unlock(dest);
-                if (src < dest)
-                        inode_unlock_shared(src);
+retry:
+        /* Wait to break both inodes' layouts before we start locking. */
+        error = break_layout(src, true);
+        if (error)
+                return error;
+        if (src != dest) {
                 error = break_layout(dest, true);
                 if (error)
                         return error;
-                goto retry;
         }
+
+        /* Lock one inode and make sure nobody got in and leased it. */
+        inode_lock(src);
+        error = break_layout(src, false);
         if (error) {
+                inode_unlock(src);
+                if (error == -EWOULDBLOCK)
+                        goto retry;
+                return error;
+        }
+
+        if (src == dest)
+                return 0;
+
+        /* Lock the other inode and make sure nobody got in and leased it. */
+        inode_lock_nested(dest, I_MUTEX_NONDIR2);
+        error = break_layout(dest, false);
+        if (error) {
+                inode_unlock(src);
                 inode_unlock(dest);
-                if (src < dest)
-                        inode_unlock_shared(src);
+                if (error == -EWOULDBLOCK)
+                        goto retry;
                 return error;
         }
-        if (src > dest)
-                inode_lock_shared_nested(src, I_MUTEX_NONDIR2);
+
         return 0;
 }
 
@@ -1247,10 +1258,10 @@ xfs_reflink_remap_unlock(
 
         xfs_iunlock(dest, XFS_MMAPLOCK_EXCL);
         if (!same_inode)
-                xfs_iunlock(src, XFS_MMAPLOCK_SHARED);
+                xfs_iunlock(src, XFS_MMAPLOCK_EXCL);
         inode_unlock(inode_out);
         if (!same_inode)
-                inode_unlock_shared(inode_in);
+                inode_unlock(inode_in);
 }
 
 /*
@@ -1325,7 +1336,7 @@ xfs_reflink_remap_prep(
         if (same_inode)
                 xfs_ilock(src, XFS_MMAPLOCK_EXCL);
         else
-                xfs_lock_two_inodes(src, XFS_MMAPLOCK_SHARED, dest,
+                xfs_lock_two_inodes(src, XFS_MMAPLOCK_EXCL, dest,
                                 XFS_MMAPLOCK_EXCL);
 
         /* Check file eligibility and prepare for block sharing. */
diff --git a/include/dt-bindings/memory/mt8183-larb-port.h b/include/dt-bindings/memory/mt8183-larb-port.h
new file mode 100644
index 000000000000..2c579f305162
--- /dev/null
+++ b/include/dt-bindings/memory/mt8183-larb-port.h
@@ -0,0 +1,130 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2018 MediaTek Inc.
+ * Author: Yong Wu <yong.wu@mediatek.com>
+ */
+#ifndef __DTS_IOMMU_PORT_MT8183_H
+#define __DTS_IOMMU_PORT_MT8183_H
+
+#define MTK_M4U_ID(larb, port)          (((larb) << 5) | (port))
+
+#define M4U_LARB0_ID                    0
+#define M4U_LARB1_ID                    1
+#define M4U_LARB2_ID                    2
+#define M4U_LARB3_ID                    3
+#define M4U_LARB4_ID                    4
+#define M4U_LARB5_ID                    5
+#define M4U_LARB6_ID                    6
+#define M4U_LARB7_ID                    7
+
+/* larb0 */
+#define M4U_PORT_DISP_OVL0              MTK_M4U_ID(M4U_LARB0_ID, 0)
+#define M4U_PORT_DISP_2L_OVL0_LARB0     MTK_M4U_ID(M4U_LARB0_ID, 1)
+#define M4U_PORT_DISP_2L_OVL1_LARB0     MTK_M4U_ID(M4U_LARB0_ID, 2)
+#define M4U_PORT_DISP_RDMA0             MTK_M4U_ID(M4U_LARB0_ID, 3)
+#define M4U_PORT_DISP_RDMA1             MTK_M4U_ID(M4U_LARB0_ID, 4)
+#define M4U_PORT_DISP_WDMA0             MTK_M4U_ID(M4U_LARB0_ID, 5)
+#define M4U_PORT_MDP_RDMA0              MTK_M4U_ID(M4U_LARB0_ID, 6)
+#define M4U_PORT_MDP_WROT0              MTK_M4U_ID(M4U_LARB0_ID, 7)
+#define M4U_PORT_MDP_WDMA0              MTK_M4U_ID(M4U_LARB0_ID, 8)
+#define M4U_PORT_DISP_FAKE0             MTK_M4U_ID(M4U_LARB0_ID, 9)
+
+/* larb1 */
+#define M4U_PORT_HW_VDEC_MC_EXT         MTK_M4U_ID(M4U_LARB1_ID, 0)
+#define M4U_PORT_HW_VDEC_PP_EXT         MTK_M4U_ID(M4U_LARB1_ID, 1)
+#define M4U_PORT_HW_VDEC_VLD_EXT        MTK_M4U_ID(M4U_LARB1_ID, 2)
+#define M4U_PORT_HW_VDEC_AVC_MV_EXT     MTK_M4U_ID(M4U_LARB1_ID, 3)
+#define M4U_PORT_HW_VDEC_PRED_RD_EXT    MTK_M4U_ID(M4U_LARB1_ID, 4)
+#define M4U_PORT_HW_VDEC_PRED_WR_EXT    MTK_M4U_ID(M4U_LARB1_ID, 5)
+#define M4U_PORT_HW_VDEC_PPWRAP_EXT     MTK_M4U_ID(M4U_LARB1_ID, 6)
+
+/* larb2 VPU0 */
+#define M4U_PORT_IMG_IPUO               MTK_M4U_ID(M4U_LARB2_ID, 0)
+#define M4U_PORT_IMG_IPU3O              MTK_M4U_ID(M4U_LARB2_ID, 1)
+#define M4U_PORT_IMG_IPUI               MTK_M4U_ID(M4U_LARB2_ID, 2)
+
+/* larb3 VPU1 */
+#define M4U_PORT_CAM_IPUO               MTK_M4U_ID(M4U_LARB3_ID, 0)
+#define M4U_PORT_CAM_IPU2O              MTK_M4U_ID(M4U_LARB3_ID, 1)
+#define M4U_PORT_CAM_IPU3O              MTK_M4U_ID(M4U_LARB3_ID, 2)
+#define M4U_PORT_CAM_IPUI               MTK_M4U_ID(M4U_LARB3_ID, 3)
+#define M4U_PORT_CAM_IPU2I              MTK_M4U_ID(M4U_LARB3_ID, 4)
+
+/* larb4 */
+#define M4U_PORT_VENC_RCPU              MTK_M4U_ID(M4U_LARB4_ID, 0)
+#define M4U_PORT_VENC_REC               MTK_M4U_ID(M4U_LARB4_ID, 1)
+#define M4U_PORT_VENC_BSDMA             MTK_M4U_ID(M4U_LARB4_ID, 2)
+#define M4U_PORT_VENC_SV_COMV           MTK_M4U_ID(M4U_LARB4_ID, 3)
+#define M4U_PORT_VENC_RD_COMV           MTK_M4U_ID(M4U_LARB4_ID, 4)
+#define M4U_PORT_JPGENC_RDMA            MTK_M4U_ID(M4U_LARB4_ID, 5)
+#define M4U_PORT_JPGENC_BSDMA           MTK_M4U_ID(M4U_LARB4_ID, 6)
+#define M4U_PORT_VENC_CUR_LUMA          MTK_M4U_ID(M4U_LARB4_ID, 7)
+#define M4U_PORT_VENC_CUR_CHROMA        MTK_M4U_ID(M4U_LARB4_ID, 8)
+#define M4U_PORT_VENC_REF_LUMA          MTK_M4U_ID(M4U_LARB4_ID, 9)
+#define M4U_PORT_VENC_REF_CHROMA        MTK_M4U_ID(M4U_LARB4_ID, 10)
+
+/* larb5 */
+#define M4U_PORT_CAM_IMGI               MTK_M4U_ID(M4U_LARB5_ID, 0)
+#define M4U_PORT_CAM_IMG2O              MTK_M4U_ID(M4U_LARB5_ID, 1)
+#define M4U_PORT_CAM_IMG3O              MTK_M4U_ID(M4U_LARB5_ID, 2)
+#define M4U_PORT_CAM_VIPI               MTK_M4U_ID(M4U_LARB5_ID, 3)
+#define M4U_PORT_CAM_LCEI               MTK_M4U_ID(M4U_LARB5_ID, 4)
+#define M4U_PORT_CAM_SMXI               MTK_M4U_ID(M4U_LARB5_ID, 5)
+#define M4U_PORT_CAM_SMXO               MTK_M4U_ID(M4U_LARB5_ID, 6)
+#define M4U_PORT_CAM_WPE0_RDMA1         MTK_M4U_ID(M4U_LARB5_ID, 7)
+#define M4U_PORT_CAM_WPE0_RDMA0         MTK_M4U_ID(M4U_LARB5_ID, 8)
+#define M4U_PORT_CAM_WPE0_WDMA          MTK_M4U_ID(M4U_LARB5_ID, 9)
+#define M4U_PORT_CAM_FDVT_RP            MTK_M4U_ID(M4U_LARB5_ID, 10)
+#define M4U_PORT_CAM_FDVT_WR            MTK_M4U_ID(M4U_LARB5_ID, 11)
+#define M4U_PORT_CAM_FDVT_RB            MTK_M4U_ID(M4U_LARB5_ID, 12)
+#define M4U_PORT_CAM_WPE1_RDMA0         MTK_M4U_ID(M4U_LARB5_ID, 13)
+#define M4U_PORT_CAM_WPE1_RDMA1         MTK_M4U_ID(M4U_LARB5_ID, 14)
+#define M4U_PORT_CAM_WPE1_WDMA          MTK_M4U_ID(M4U_LARB5_ID, 15)
+#define M4U_PORT_CAM_DPE_RDMA           MTK_M4U_ID(M4U_LARB5_ID, 16)
+#define M4U_PORT_CAM_DPE_WDMA           MTK_M4U_ID(M4U_LARB5_ID, 17)
+#define M4U_PORT_CAM_MFB_RDMA0          MTK_M4U_ID(M4U_LARB5_ID, 18)
+#define M4U_PORT_CAM_MFB_RDMA1          MTK_M4U_ID(M4U_LARB5_ID, 19)
+#define M4U_PORT_CAM_MFB_WDMA           MTK_M4U_ID(M4U_LARB5_ID, 20)
+#define M4U_PORT_CAM_RSC_RDMA0          MTK_M4U_ID(M4U_LARB5_ID, 21)
+#define M4U_PORT_CAM_RSC_WDMA           MTK_M4U_ID(M4U_LARB5_ID, 22)
+#define M4U_PORT_CAM_OWE_RDMA           MTK_M4U_ID(M4U_LARB5_ID, 23)
+#define M4U_PORT_CAM_OWE_WDMA           MTK_M4U_ID(M4U_LARB5_ID, 24)
+
+/* larb6 */
+#define M4U_PORT_CAM_IMGO               MTK_M4U_ID(M4U_LARB6_ID, 0)
+#define M4U_PORT_CAM_RRZO               MTK_M4U_ID(M4U_LARB6_ID, 1)
+#define M4U_PORT_CAM_AAO                MTK_M4U_ID(M4U_LARB6_ID, 2)
+#define M4U_PORT_CAM_AFO                MTK_M4U_ID(M4U_LARB6_ID, 3)
+#define M4U_PORT_CAM_LSCI0              MTK_M4U_ID(M4U_LARB6_ID, 4)
+#define M4U_PORT_CAM_LSCI1              MTK_M4U_ID(M4U_LARB6_ID, 5)
+#define M4U_PORT_CAM_PDO                MTK_M4U_ID(M4U_LARB6_ID, 6)
+#define M4U_PORT_CAM_BPCI               MTK_M4U_ID(M4U_LARB6_ID, 7)
+#define M4U_PORT_CAM_LCSO               MTK_M4U_ID(M4U_LARB6_ID, 8)
+#define M4U_PORT_CAM_CAM_RSSO_A         MTK_M4U_ID(M4U_LARB6_ID, 9)
+#define M4U_PORT_CAM_UFEO               MTK_M4U_ID(M4U_LARB6_ID, 10)
+#define M4U_PORT_CAM_SOCO               MTK_M4U_ID(M4U_LARB6_ID, 11)
+#define M4U_PORT_CAM_SOC1               MTK_M4U_ID(M4U_LARB6_ID, 12)
+#define M4U_PORT_CAM_SOC2               MTK_M4U_ID(M4U_LARB6_ID, 13)
+#define M4U_PORT_CAM_CCUI               MTK_M4U_ID(M4U_LARB6_ID, 14)
+#define M4U_PORT_CAM_CCUO               MTK_M4U_ID(M4U_LARB6_ID, 15)
+#define M4U_PORT_CAM_RAWI_A             MTK_M4U_ID(M4U_LARB6_ID, 16)
+#define M4U_PORT_CAM_CCUG               MTK_M4U_ID(M4U_LARB6_ID, 17)
+#define M4U_PORT_CAM_PSO                MTK_M4U_ID(M4U_LARB6_ID, 18)
+#define M4U_PORT_CAM_AFO_1              MTK_M4U_ID(M4U_LARB6_ID, 19)
+#define M4U_PORT_CAM_LSCI_2             MTK_M4U_ID(M4U_LARB6_ID, 20)
+#define M4U_PORT_CAM_PDI                MTK_M4U_ID(M4U_LARB6_ID, 21)
+#define M4U_PORT_CAM_FLKO               MTK_M4U_ID(M4U_LARB6_ID, 22)
+#define M4U_PORT_CAM_LMVO               MTK_M4U_ID(M4U_LARB6_ID, 23)
+#define M4U_PORT_CAM_UFGO               MTK_M4U_ID(M4U_LARB6_ID, 24)
+#define M4U_PORT_CAM_SPARE              MTK_M4U_ID(M4U_LARB6_ID, 25)
+#define M4U_PORT_CAM_SPARE_2            MTK_M4U_ID(M4U_LARB6_ID, 26)
+#define M4U_PORT_CAM_SPARE_3            MTK_M4U_ID(M4U_LARB6_ID, 27)
+#define M4U_PORT_CAM_SPARE_4            MTK_M4U_ID(M4U_LARB6_ID, 28)
+#define M4U_PORT_CAM_SPARE_5            MTK_M4U_ID(M4U_LARB6_ID, 29)
+#define M4U_PORT_CAM_SPARE_6            MTK_M4U_ID(M4U_LARB6_ID, 30)
+
+/* CCU */
+#define M4U_PORT_CCU0                   MTK_M4U_ID(M4U_LARB7_ID, 0)
+#define M4U_PORT_CCU1                   MTK_M4U_ID(M4U_LARB7_ID, 1)
+
+#endif
diff --git a/include/linux/amd-iommu.h b/include/linux/amd-iommu.h
index 4a4d00646040..21e950e4ab62 100644
--- a/include/linux/amd-iommu.h
+++ b/include/linux/amd-iommu.h
@@ -184,6 +184,9 @@ extern int amd_iommu_register_ga_log_notifier(int (*notifier)(u32));
 extern int
 amd_iommu_update_ga(int cpu, bool is_run, void *data);
 
+extern int amd_iommu_activate_guest_mode(void *data);
+extern int amd_iommu_deactivate_guest_mode(void *data);
+
 #else /* defined(CONFIG_AMD_IOMMU) && defined(CONFIG_IRQ_REMAP) */
 
 static inline int
@@ -198,6 +201,15 @@ amd_iommu_update_ga(int cpu, bool is_run, void *data)
         return 0;
 }
 
+static inline int amd_iommu_activate_guest_mode(void *data)
+{
+        return 0;
+}
+
+static inline int amd_iommu_deactivate_guest_mode(void *data)
+{
+        return 0;
+}
 #endif /* defined(CONFIG_AMD_IOMMU) && defined(CONFIG_IRQ_REMAP) */
 
 #endif /* _ASM_X86_AMD_IOMMU_H */
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index feff3fe4467e..1b1fa1557e68 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -311,6 +311,7 @@ enum req_flag_bits {
         __REQ_RAHEAD,           /* read ahead, can fail anytime */
         __REQ_BACKGROUND,       /* background IO */
         __REQ_NOWAIT,           /* Don't wait if request will block */
+        __REQ_NOWAIT_INLINE,    /* Return would-block error inline */
         /*
          * When a shared kthread needs to issue a bio for a cgroup, doing
          * so synchronously can lead to priority inversions as the kthread
@@ -345,6 +346,7 @@ enum req_flag_bits {
 #define REQ_RAHEAD              (1ULL << __REQ_RAHEAD)
 #define REQ_BACKGROUND          (1ULL << __REQ_BACKGROUND)
 #define REQ_NOWAIT              (1ULL << __REQ_NOWAIT)
+#define REQ_NOWAIT_INLINE       (1ULL << __REQ_NOWAIT_INLINE)
 #define REQ_CGROUP_PUNT         (1ULL << __REQ_CGROUP_PUNT)
 
 #define REQ_NOUNMAP             (1ULL << __REQ_NOUNMAP)
@@ -418,12 +420,13 @@ static inline int op_stat_group(unsigned int op)
 
 typedef unsigned int blk_qc_t;
 #define BLK_QC_T_NONE           -1U
+#define BLK_QC_T_EAGAIN         -2U
 #define BLK_QC_T_SHIFT          16
 #define BLK_QC_T_INTERNAL       (1U << 31)
 
 static inline bool blk_qc_t_valid(blk_qc_t cookie)
 {
-        return cookie != BLK_QC_T_NONE;
+        return cookie != BLK_QC_T_NONE && cookie != BLK_QC_T_EAGAIN;
 }
 
 static inline unsigned int blk_qc_t_to_queue_num(blk_qc_t cookie)
diff --git a/include/linux/ceph/buffer.h b/include/linux/ceph/buffer.h
index 5e58bb29b1a3..11cdc7c60480 100644
--- a/include/linux/ceph/buffer.h
+++ b/include/linux/ceph/buffer.h
@@ -30,7 +30,8 @@ static inline struct ceph_buffer *ceph_buffer_get(struct ceph_buffer *b)
 
 static inline void ceph_buffer_put(struct ceph_buffer *b)
 {
-        kref_put(&b->kref, ceph_buffer_release);
+        if (b)
+                kref_put(&b->kref, ceph_buffer_release);
 }
 
 extern int ceph_decode_buffer(struct ceph_buffer **b, void **p, void *end);
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index f0fd5636fddb..5e88e7e33abe 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -24,7 +24,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
                         long ______r;                                   \
                         static struct ftrace_likely_data                \
                                 __aligned(4)                            \
-                                __section("_ftrace_annotated_branch")   \
+                                __section(_ftrace_annotated_branch)     \
                                 ______f = {                             \
                                 .data.func = __func__,                  \
                                 .data.file = __FILE__,                  \
@@ -60,7 +60,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
 #define __trace_if_value(cond) ({                       \
         static struct ftrace_branch_data                \
                 __aligned(4)                            \
-                __section("_ftrace_branch")             \
+                __section(_ftrace_branch)               \
                 __if_trace = {                          \
                         .func = __func__,               \
                         .file = __FILE__,               \
@@ -118,7 +118,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
         ".popsection\n\t"
 
 /* Annotate a C jump table to allow objtool to follow the code flow */
-#define __annotate_jump_table __section(".rodata..c_jump_table")
+#define __annotate_jump_table __section(.rodata..c_jump_table)
 
 #else
 #define annotate_reachable()
@@ -298,7 +298,7 @@ unsigned long read_word_at_a_time(const void *addr)
  * visible to the compiler.
  */
 #define __ADDRESSABLE(sym) \
-        static void * __section(".discard.addressable") __used \
+        static void * __section(.discard.addressable) __used \
                 __PASTE(__addressable_##sym, __LINE__) = (void *)&sym;
 
 /**
diff --git a/include/linux/dma-contiguous.h b/include/linux/dma-contiguous.h
index c05d4e661489..03f8e98e3bcc 100644
--- a/include/linux/dma-contiguous.h
+++ b/include/linux/dma-contiguous.h
@@ -160,10 +160,7 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages,
 static inline struct page *dma_alloc_contiguous(struct device *dev, size_t size,
                 gfp_t gfp)
 {
-        int node = dev ? dev_to_node(dev) : NUMA_NO_NODE;
-        size_t align = get_order(PAGE_ALIGN(size));
-
-        return alloc_pages_node(node, gfp, align);
+        return NULL;
 }
 
 static inline void dma_free_contiguous(struct device *dev, struct page *page,
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index 40915b461f18..f757a58191a6 100644
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -241,30 +241,6 @@ static inline int irq_to_gpio(unsigned irq)
         return -EINVAL;
 }
 
-static inline int
-gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
-                       unsigned int gpio_offset, unsigned int pin_offset,
-                       unsigned int npins)
-{
-        WARN_ON(1);
-        return -EINVAL;
-}
-
-static inline int
-gpiochip_add_pingroup_range(struct gpio_chip *chip,
-                        struct pinctrl_dev *pctldev,
-                        unsigned int gpio_offset, const char *pin_group)
-{
-        WARN_ON(1);
-        return -EINVAL;
-}
-
-static inline void
-gpiochip_remove_pin_ranges(struct gpio_chip *chip)
-{
-        WARN_ON(1);
-}
-
 static inline int devm_gpio_request(struct device *dev, unsigned gpio,
                                     const char *label)
 {
diff --git a/include/linux/input/elan-i2c-ids.h b/include/linux/input/elan-i2c-ids.h
index ceabb01a6a7d..1ecb6b45812c 100644
--- a/include/linux/input/elan-i2c-ids.h
+++ b/include/linux/input/elan-i2c-ids.h
@@ -48,7 +48,7 @@ static const struct acpi_device_id elan_acpi_id[] = {
         { "ELAN0618", 0 },
         { "ELAN0619", 0 },
         { "ELAN061A", 0 },
-        { "ELAN061B", 0 },
+/*      { "ELAN061B", 0 }, not working on the Lenovo Legion Y7000 */
         { "ELAN061C", 0 },
         { "ELAN061D", 0 },
         { "ELAN061E", 0 },
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index f2ae8a006ff8..ed11ef594378 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -272,6 +272,8 @@
 #define dma_frcd_type(d) ((d >> 30) & 1)
 #define dma_frcd_fault_reason(c) (c & 0xff)
 #define dma_frcd_source_id(c) (c & 0xffff)
+#define dma_frcd_pasid_value(c) (((c) >> 8) & 0xfffff)
+#define dma_frcd_pasid_present(c) (((c) >> 31) & 1)
 /* low 64 bit */
 #define dma_frcd_page_addr(d) (d & (((u64)-1) << PAGE_SHIFT))
 
@@ -346,7 +348,6 @@ enum {
 #define QI_PC_PASID_SEL         (QI_PC_TYPE | QI_PC_GRAN(1))
 
 #define QI_EIOTLB_ADDR(addr)    ((u64)(addr) & VTD_PAGE_MASK)
-#define QI_EIOTLB_GL(gl)        (((u64)gl) << 7)
 #define QI_EIOTLB_IH(ih)        (((u64)ih) << 6)
 #define QI_EIOTLB_AM(am)        (((u64)am))
 #define QI_EIOTLB_PASID(pasid)  (((u64)pasid) << 32)
@@ -378,8 +379,6 @@ enum {
 #define QI_RESP_INVALID         0x1
 #define QI_RESP_FAILURE         0xf
 
-#define QI_GRAN_ALL_ALL                 0
-#define QI_GRAN_NONG_ALL                1
 #define QI_GRAN_NONG_PASID              2
 #define QI_GRAN_PSI_PASID               3
 
diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h
index 6b1b8be3ebec..ec7a13405f10 100644
--- a/include/linux/io-pgtable.h
+++ b/include/linux/io-pgtable.h
@@ -76,10 +76,9 @@ struct io_pgtable_cfg {
          *      (unmapped) entries but the hardware might do so anyway, perform
          *      TLB maintenance when mapping as well as when unmapping.
          *
-         * IO_PGTABLE_QUIRK_ARM_MTK_4GB: (ARM v7s format) Set bit 9 in all
-         *      PTEs, for Mediatek IOMMUs which treat it as a 33rd address bit
-         *      when the SoC is in "4GB mode" and they can only access the high
-         *      remap of DRAM (0x1_00000000 to 0x1_ffffffff).
+         * IO_PGTABLE_QUIRK_ARM_MTK_EXT: (ARM v7s format) MediaTek IOMMUs extend
+         *      to support up to 34 bits PA where the bit32 and bit33 are
+         *      encoded in the bit9 and bit4 of the PTE respectively.
          *
          * IO_PGTABLE_QUIRK_NON_STRICT: Skip issuing synchronous leaf TLBIs
          *      on unmap, for DMA domains using the flush queue mechanism for
@@ -88,7 +87,7 @@ struct io_pgtable_cfg {
         #define IO_PGTABLE_QUIRK_ARM_NS         BIT(0)
         #define IO_PGTABLE_QUIRK_NO_PERMS       BIT(1)
         #define IO_PGTABLE_QUIRK_TLBI_ON_MAP    BIT(2)
-        #define IO_PGTABLE_QUIRK_ARM_MTK_4GB    BIT(3)
+        #define IO_PGTABLE_QUIRK_ARM_MTK_EXT    BIT(3)
         #define IO_PGTABLE_QUIRK_NON_STRICT     BIT(4)
         unsigned long                   quirks;
         unsigned long                   pgsize_bitmap;
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 64ebaff33455..29bac5345563 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -436,6 +436,9 @@ extern void iommu_get_resv_regions(struct device *dev, struct list_head *list);
 extern void iommu_put_resv_regions(struct device *dev, struct list_head *list);
 extern int iommu_request_dm_for_dev(struct device *dev);
 extern int iommu_request_dma_domain_for_dev(struct device *dev);
+extern void iommu_set_default_passthrough(bool cmd_line);
+extern void iommu_set_default_translated(bool cmd_line);
+extern bool iommu_default_passthrough(void);
 extern struct iommu_resv_region *
 iommu_alloc_resv_region(phys_addr_t start, size_t length, int prot,
                         enum iommu_resv_type type);
@@ -736,6 +739,19 @@ static inline int iommu_request_dma_domain_for_dev(struct device *dev)
         return -ENODEV;
 }
 
+static inline void iommu_set_default_passthrough(bool cmd_line)
+{
+}
+
+static inline void iommu_set_default_translated(bool cmd_line)
+{
+}
+
+static inline bool iommu_default_passthrough(void)
+{
+        return true;
+}
+
 static inline int iommu_attach_group(struct iommu_domain *domain,
                                      struct iommu_group *group)
 {
diff --git a/include/linux/key.h b/include/linux/key.h
index 91f391cd272e..50028338a4cc 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -94,11 +94,11 @@ struct keyring_index_key {
         union {
                 struct {
 #ifdef __LITTLE_ENDIAN /* Put desc_len at the LSB of x */
-                        u8      desc_len;
-                        char    desc[sizeof(long) - 1]; /* First few chars of description */
+                        u16     desc_len;
+                        char    desc[sizeof(long) - 2]; /* First few chars of description */
 #else
-                        char    desc[sizeof(long) - 1]; /* First few chars of description */
-                        u8      desc_len;
+                        char    desc[sizeof(long) - 2]; /* First few chars of description */
+                        u16     desc_len;
 #endif
                 };
                 unsigned long x;
diff --git a/include/linux/logic_pio.h b/include/linux/logic_pio.h
index cbd9d8495690..88e1e6304a71 100644
--- a/include/linux/logic_pio.h
+++ b/include/linux/logic_pio.h
@@ -117,6 +117,7 @@ struct logic_pio_hwaddr *find_io_range_by_fwnode(struct fwnode_handle *fwnode);
 unsigned long logic_pio_trans_hwaddr(struct fwnode_handle *fwnode,
                         resource_size_t hw_addr, resource_size_t size);
 int logic_pio_register_range(struct logic_pio_hwaddr *newrange);
+void logic_pio_unregister_range(struct logic_pio_hwaddr *range);
 resource_size_t logic_pio_to_hwaddr(unsigned long pio);
 unsigned long logic_pio_trans_cpuaddr(resource_size_t hw_addr);
 
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index ce9839c8bc1a..c2f056b5766d 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -446,11 +446,11 @@ enum {
 };
 
 enum {
-        MLX5_OPC_MOD_TLS_TIS_STATIC_PARAMS = 0x20,
+        MLX5_OPC_MOD_TLS_TIS_STATIC_PARAMS = 0x1,
 };
 
 enum {
-        MLX5_OPC_MOD_TLS_TIS_PROGRESS_PARAMS = 0x20,
+        MLX5_OPC_MOD_TLS_TIS_PROGRESS_PARAMS = 0x1,
 };
 
 enum {
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index ec571fd7fcf8..b8b570c30b5e 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -10054,9 +10054,8 @@ struct mlx5_ifc_tls_static_params_bits {
 };
 
 struct mlx5_ifc_tls_progress_params_bits {
-        u8         valid[0x1];
-        u8         reserved_at_1[0x7];
-        u8         pd[0x18];
+        u8         reserved_at_0[0x8];
+        u8         tisn[0x18];
 
         u8         next_record_tcp_sn[0x20];
 
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index d77d717c620c..3f38c30d2f13 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -215,8 +215,9 @@ enum node_stat_item {
         NR_INACTIVE_FILE,       /*  "     "     "   "       "         */
         NR_ACTIVE_FILE,         /*  "     "     "   "       "         */
         NR_UNEVICTABLE,         /*  "     "     "   "       "         */
-        NR_SLAB_RECLAIMABLE,
-        NR_SLAB_UNRECLAIMABLE,
+        NR_SLAB_RECLAIMABLE,    /* Please do not reorder this item */
+        NR_SLAB_UNRECLAIMABLE,  /* and this one without looking at
+                                 * memcg_flush_percpu_vmstats() first. */
         NR_ISOLATED_ANON,       /* Temporary isolated pages from anon lru */
         NR_ISOLATED_FILE,       /* Temporary isolated pages from file lru */
         WORKINGSET_NODES,
diff --git a/include/linux/netfilter/nf_conntrack_h323_types.h b/include/linux/netfilter/nf_conntrack_h323_types.h
index 7a6871ac8784..74c6f9241944 100644
--- a/include/linux/netfilter/nf_conntrack_h323_types.h
+++ b/include/linux/netfilter/nf_conntrack_h323_types.h
@@ -4,6 +4,9 @@
  * Copyright (c) 2006 Jing Min Zhao <zhaojingmin@users.sourceforge.net>
  */
 
+#ifndef _NF_CONNTRACK_H323_TYPES_H
+#define _NF_CONNTRACK_H323_TYPES_H
+
 typedef struct TransportAddress_ipAddress {     /* SEQUENCE */
         int options;            /* No use */
         unsigned int ip;
@@ -931,3 +934,5 @@ typedef struct RasMessage {	/* CHOICE */
                 InfoRequestResponse infoRequestResponse;
         };
 } RasMessage;
+
+#endif /* _NF_CONNTRACK_H323_TYPES_H */
diff --git a/include/linux/omap-iommu.h b/include/linux/omap-iommu.h
index 153bf25b4df3..2c32ca09df02 100644
--- a/include/linux/omap-iommu.h
+++ b/include/linux/omap-iommu.h
@@ -10,12 +10,27 @@
 #ifndef _OMAP_IOMMU_H_
 #define _OMAP_IOMMU_H_
 
+struct iommu_domain;
+
 #ifdef CONFIG_OMAP_IOMMU
 extern void omap_iommu_save_ctx(struct device *dev);
 extern void omap_iommu_restore_ctx(struct device *dev);
+
+int omap_iommu_domain_deactivate(struct iommu_domain *domain);
+int omap_iommu_domain_activate(struct iommu_domain *domain);
 #else
 static inline void omap_iommu_save_ctx(struct device *dev) {}
 static inline void omap_iommu_restore_ctx(struct device *dev) {}
+
+static inline int omap_iommu_domain_deactivate(struct iommu_domain *domain)
+{
+        return -ENODEV;
+}
+
+static inline int omap_iommu_domain_activate(struct iommu_domain *domain)
+{
+        return -ENODEV;
+}
 #endif
 
 #endif
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 462b90b73f93..2fb9c8ffaf10 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1107,6 +1107,7 @@ int genphy_c45_an_disable_aneg(struct phy_device *phydev);
 int genphy_c45_read_mdix(struct phy_device *phydev);
 int genphy_c45_pma_read_abilities(struct phy_device *phydev);
 int genphy_c45_read_status(struct phy_device *phydev);
+int genphy_c45_config_aneg(struct phy_device *phydev);
 
 /* The gen10g_* functions are the old Clause 45 stub */
 int gen10g_config_aneg(struct phy_device *phydev);
diff --git a/include/linux/platform_data/iommu-omap.h b/include/linux/platform_data/iommu-omap.h
index 44d913a7580c..8474a0208b34 100644
--- a/include/linux/platform_data/iommu-omap.h
+++ b/include/linux/platform_data/iommu-omap.h
@@ -13,4 +13,8 @@ struct iommu_platform_data {
         const char *reset_name;
         int (*assert_reset)(struct platform_device *pdev, const char *name);
         int (*deassert_reset)(struct platform_device *pdev, const char *name);
+        int (*device_enable)(struct platform_device *pdev);
+        int (*device_idle)(struct platform_device *pdev);
+        int (*set_pwrdm_constraint)(struct platform_device *pdev, bool request,
+                                    u8 *pwrst);
 };
diff --git a/include/linux/signal.h b/include/linux/signal.h
index b5d99482d3fe..1a5f88316b08 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -282,6 +282,9 @@ extern void signal_setup_done(int failed, struct ksignal *ksig, int stepping);
 extern void exit_signals(struct task_struct *tsk);
 extern void kernel_sigaction(int, __sighandler_t);
 
+#define SIG_KTHREAD ((__force __sighandler_t)2)
+#define SIG_KTHREAD_KERNEL ((__force __sighandler_t)3)
+
 static inline void allow_signal(int sig)
 {
         /*
@@ -289,7 +292,17 @@ static inline void allow_signal(int sig)
          * know it'll be handled, so that they don't get converted to
          * SIGKILL or just silently dropped.
          */
-        kernel_sigaction(sig, (__force __sighandler_t)2);
+        kernel_sigaction(sig, SIG_KTHREAD);
+}
+
+static inline void allow_kernel_signal(int sig)
+{
+        /*
+         * Kernel threads handle their own signals. Let the signal code
+         * know signals sent by the kernel will be handled, so that they
+         * don't get silently dropped.
+         */
+        kernel_sigaction(sig, SIG_KTHREAD_KERNEL);
 }
 
 static inline void disallow_signal(int sig)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index d8af86d995d6..ba5583522d24 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1374,6 +1374,14 @@ static inline void skb_copy_hash(struct sk_buff *to, const struct sk_buff *from)
         to->l4_hash = from->l4_hash;
 };
 
+static inline void skb_copy_decrypted(struct sk_buff *to,
+                                      const struct sk_buff *from)
+{
+#ifdef CONFIG_TLS_DEVICE
+        to->decrypted = from->decrypted;
+#endif
+}
+
 #ifdef NET_SKBUFF_DATA_USES_OFFSET
 static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
 {
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 97523818cb14..fc0bed59fc84 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -292,6 +292,9 @@ struct ucred {
 #define MSG_BATCH       0x40000 /* sendmmsg(): more messages coming */
 #define MSG_EOF         MSG_FIN
 #define MSG_NO_SHARED_FRAGS 0x80000 /* sendpage() internal : page frags are not shared */
+#define MSG_SENDPAGE_DECRYPTED  0x100000 /* sendpage() internal : page may carry
+                                          * plain text and require encryption
+                                          */
 
 #define MSG_ZEROCOPY    0x4000000       /* Use user data in kernel path */
 #define MSG_FASTOPEN    0x20000000      /* Send data in TCP SYN */
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index baa3ecdb882f..27536b961552 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -98,7 +98,6 @@ typedef void			(*rpc_action)(struct rpc_task *);
 
 struct rpc_call_ops {
         void (*rpc_call_prepare)(struct rpc_task *, void *);
-        void (*rpc_call_prepare_transmit)(struct rpc_task *, void *);
         void (*rpc_call_done)(struct rpc_task *, void *);
         void (*rpc_count_stats)(struct rpc_task *, void *);
         void (*rpc_release)(void *);
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 361f62bb4a8e..cde3dc18e21a 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -46,13 +46,17 @@ enum dma_sync_target {
 
 extern phys_addr_t swiotlb_tbl_map_single(struct device *hwdev,
                                           dma_addr_t tbl_dma_addr,
-                                          phys_addr_t phys, size_t size,
+                                          phys_addr_t phys,
+                                          size_t mapping_size,
+                                          size_t alloc_size,
                                           enum dma_data_direction dir,
                                           unsigned long attrs);
 
 extern void swiotlb_tbl_unmap_single(struct device *hwdev,
                                      phys_addr_t tlb_addr,
-                                     size_t size, enum dma_data_direction dir,
+                                     size_t mapping_size,
+                                     size_t alloc_size,
+                                     enum dma_data_direction dir,
                                      unsigned long attrs);
 
 extern void swiotlb_tbl_sync_single(struct device *hwdev,
diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
index 7acb953298a7..84ff2844df2a 100644
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
@@ -57,6 +57,7 @@ struct tk_read_base {
  * @cs_was_changed_seq: The sequence number of clocksource change events
  * @next_leap_ktime:    CLOCK_MONOTONIC time value of a pending leap-second
  * @raw_sec:            CLOCK_MONOTONIC_RAW  time in seconds
+ * @monotonic_to_boot:  CLOCK_MONOTONIC to CLOCK_BOOTTIME offset
  * @cycle_interval:     Number of clock cycles in one NTP interval
  * @xtime_interval:     Number of clock shifted nano seconds in one NTP
  *                      interval.
@@ -84,6 +85,9 @@ struct tk_read_base {
  *
  * wall_to_monotonic is no longer the boot time, getboottime must be
  * used instead.
+ *
+ * @monotonic_to_boottime is a timespec64 representation of @offs_boot to
+ * accelerate the VDSO update for CLOCK_BOOTTIME.
  */
 struct timekeeper {
         struct tk_read_base     tkr_mono;
@@ -99,6 +103,7 @@ struct timekeeper {
         u8                      cs_was_changed_seq;
         ktime_t                 next_leap_ktime;
         u64                     raw_sec;
+        struct timespec64       monotonic_to_boot;
 
         /* The following members are for timekeeping internal use */
         u64                     cycle_interval;
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index 5150436783e8..30a8cdcfd4a4 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -548,6 +548,7 @@ extern int trace_event_get_offsets(struct trace_event_call *call);
 
 #define is_signed_type(type)    (((type)(-1)) < (type)1)
 
+int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set);
 int trace_set_clr_event(const char *system, const char *event, int set);
 
 /*
diff --git a/include/math-emu/op-common.h b/include/math-emu/op-common.h
index f37d12877754..adcc6a97db61 100644
--- a/include/math-emu/op-common.h
+++ b/include/math-emu/op-common.h
@@ -308,6 +308,7 @@ do {									     \
                                                                              \
   case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):                           \
     R##_e = X##_e;                                                           \
+          /* Fall through */                                                 \
   case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL):                            \
   case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):                               \
   case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):                              \
@@ -318,6 +319,7 @@ do {									     \
                                                                              \
   case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL):                           \
     R##_e = Y##_e;                                                           \
+          /* Fall through */                                                 \
   case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN):                            \
   case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):                               \
   case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):                              \
@@ -415,6 +417,7 @@ do {							\
   case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):          \
   case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):         \
     R##_s = X##_s;                                      \
+        /* Fall through */                              \
                                                         \
   case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF):          \
   case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):       \
@@ -428,6 +431,7 @@ do {							\
   case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):          \
   case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):         \
     R##_s = Y##_s;                                      \
+        /* Fall through */                              \
                                                         \
   case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF):       \
   case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):      \
@@ -493,6 +497,7 @@ do {							\
                                                         \
   case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):      \
     FP_SET_EXCEPTION(FP_EX_DIVZERO);                    \
+          /* Fall through */                            \
   case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO):         \
   case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):       \
     R##_c = FP_CLS_INF;                                 \
diff --git a/include/net/act_api.h b/include/net/act_api.h
index c61a1bf4e3de..3a1a72990fce 100644
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -15,6 +15,7 @@
 struct tcf_idrinfo {
         struct mutex    lock;
         struct idr      action_idr;
+        struct net      *net;
 };
 
 struct tc_action_ops;
@@ -108,7 +109,7 @@ struct tc_action_net {
 };
 
 static inline
-int tc_action_net_init(struct tc_action_net *tn,
+int tc_action_net_init(struct net *net, struct tc_action_net *tn,
                        const struct tc_action_ops *ops)
 {
         int err = 0;
@@ -117,6 +118,7 @@ int tc_action_net_init(struct tc_action_net *tn,
         if (!tn->idrinfo)
                 return -ENOMEM;
         tn->ops = ops;
+        tn->idrinfo->net = net;
         mutex_init(&tn->idrinfo->lock);
         idr_init(&tn->idrinfo->action_idr);
         return err;
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index becdad576859..3f62b347b04a 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -206,7 +206,7 @@ static inline int ipv6_mc_may_pull(struct sk_buff *skb,
                                    unsigned int len)
 {
         if (skb_transport_offset(skb) + ipv6_transport_len(skb) < len)
-                return -EINVAL;
+                return 0;
 
         return pskb_may_pull(skb, len);
 }
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index ded574b32c20..ffc95b382eb5 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -278,6 +278,7 @@ struct hci_dev {
         __u16           conn_info_min_age;
         __u16           conn_info_max_age;
         __u16           auth_payload_timeout;
+        __u8            min_enc_key_size;
         __u8            ssp_debug_mode;
         __u8            hw_error_code;
         __u32           clock;
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index 010f26b31c89..bac79e817776 100644
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -171,7 +171,7 @@ int inet_frag_queue_insert(struct inet_frag_queue *q, struct sk_buff *skb,
 void *inet_frag_reasm_prepare(struct inet_frag_queue *q, struct sk_buff *skb,
                               struct sk_buff *parent);
 void inet_frag_reasm_finish(struct inet_frag_queue *q, struct sk_buff *head,
-                            void *reasm_data);
+                            void *reasm_data, bool try_coalesce);
 struct sk_buff *inet_frag_pull_head(struct inet_frag_queue *q);
 
 #endif
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 4a9da951a794..ab40d7afdc54 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -52,7 +52,7 @@ struct bpf_prog;
 #define NETDEV_HASHENTRIES (1 << NETDEV_HASHBITS)
 
 struct net {
-        refcount_t              passive;        /* To decided when the network
+        refcount_t              passive;        /* To decide when the network
                                                  * namespace should be freed.
                                                  */
         refcount_t              count;          /* To decided when the network
@@ -61,7 +61,6 @@ struct net {
         spinlock_t              rules_mod_lock;
 
         u32                     hash_mix;
-        atomic64_t              cookie_gen;
 
         struct list_head        list;           /* list of network namespaces */
         struct list_head        exit_list;      /* To linked to call pernet exit
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 9b624566b82d..475d6f28ca67 100644
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -421,8 +421,7 @@ struct nft_set {
         unsigned char                   *udata;
         /* runtime data below here */
         const struct nft_set_ops        *ops ____cacheline_aligned;
-        u16                             flags:13,
-                                        bound:1,
+        u16                             flags:14,
                                         genmask:2;
         u8                              klen;
         u8                              dlen;
@@ -1348,12 +1347,15 @@ struct nft_trans_rule {
 struct nft_trans_set {
         struct nft_set                  *set;
         u32                             set_id;
+        bool                            bound;
 };
 
 #define nft_trans_set(trans)    \
         (((struct nft_trans_set *)trans->data)->set)
 #define nft_trans_set_id(trans) \
         (((struct nft_trans_set *)trans->data)->set_id)
+#define nft_trans_set_bound(trans)      \
+        (((struct nft_trans_set *)trans->data)->bound)
 
 struct nft_trans_chain {
         bool                            update;
@@ -1384,12 +1386,15 @@ struct nft_trans_table {
 struct nft_trans_elem {
         struct nft_set                  *set;
         struct nft_set_elem             elem;
+        bool                            bound;
 };
 
 #define nft_trans_elem_set(trans)       \
         (((struct nft_trans_elem *)trans->data)->set)
 #define nft_trans_elem(trans)   \
         (((struct nft_trans_elem *)trans->data)->elem)
+#define nft_trans_elem_set_bound(trans) \
+        (((struct nft_trans_elem *)trans->data)->bound)
 
 struct nft_trans_obj {
         struct nft_object               *obj;
diff --git a/include/net/netfilter/nf_tables_offload.h b/include/net/netfilter/nf_tables_offload.h
index 3196663a10e3..c8b9dec376f5 100644
--- a/include/net/netfilter/nf_tables_offload.h
+++ b/include/net/netfilter/nf_tables_offload.h
@@ -73,4 +73,6 @@ int nft_flow_rule_offload_commit(struct net *net);
         (__reg)->key            = __key;                                \
         memset(&(__reg)->mask, 0xff, (__reg)->len);
 
+int nft_chain_offload_priority(struct nft_base_chain *basechain);
+
 #endif
diff --git a/include/net/netlink.h b/include/net/netlink.h
index e4650e5b64a1..b140c8f1be22 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -684,9 +684,8 @@ static inline int nlmsg_parse(const struct nlmsghdr *nlh, int hdrlen,
                               const struct nla_policy *policy,
                               struct netlink_ext_ack *extack)
 {
-        return __nla_parse(tb, maxtype, nlmsg_attrdata(nlh, hdrlen),
-                           nlmsg_attrlen(nlh, hdrlen), policy,
-                           NL_VALIDATE_STRICT, extack);
+        return __nlmsg_parse(nlh, hdrlen, tb, maxtype, policy,
+                             NL_VALIDATE_STRICT, extack);
 }
 
 /**
diff --git a/include/net/nexthop.h b/include/net/nexthop.h
index 25f1f9a8419b..95f766c31c90 100644
--- a/include/net/nexthop.h
+++ b/include/net/nexthop.h
@@ -141,12 +141,6 @@ static inline unsigned int nexthop_num_path(const struct nexthop *nh)
 
                 nh_grp = rcu_dereference_rtnl(nh->nh_grp);
                 rc = nh_grp->num_nh;
-        } else {
-                const struct nh_info *nhi;
-
-                nhi = rcu_dereference_rtnl(nh->nh_info);
-                if (nhi->reject_nh)
-                        rc = 0;
         }
 
         return rc;
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index e429809ca90d..98be18ef1ed3 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -646,7 +646,7 @@ tc_cls_common_offload_init(struct flow_cls_common_offload *cls_common,
 {
         cls_common->chain_index = tp->chain->index;
         cls_common->protocol = tp->protocol;
-        cls_common->prio = tp->prio;
+        cls_common->prio = tp->prio >> 16;
         if (tc_skip_sw(flags) || flags & TCA_CLS_FLAGS_VERBOSE)
                 cls_common->extack = extack;
 }
diff --git a/include/net/psample.h b/include/net/psample.h
index 37a4df2325b2..6b578ce69cd8 100644
--- a/include/net/psample.h
+++ b/include/net/psample.h
@@ -11,6 +11,7 @@ struct psample_group {
         u32 group_num;
         u32 refcount;
         u32 seq;
+        struct rcu_head rcu;
 };
 
 struct psample_group *psample_group_get(struct net *net, u32 group_num);
diff --git a/include/net/route.h b/include/net/route.h
index 630a0493f1f3..dfce19c9fa96 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -233,7 +233,7 @@ void rt_del_uncached_list(struct rtable *rt);
 
 int fib_dump_info_fnhe(struct sk_buff *skb, struct netlink_callback *cb,
                        u32 table_id, struct fib_info *fi,
-                       int *fa_index, int fa_start);
+                       int *fa_index, int fa_start, unsigned int flags);
 
 static inline void ip_rt_put(struct rtable *rt)
 {
diff --git a/include/net/sock.h b/include/net/sock.h
index 228db3998e46..2c53f1a1d905 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2482,6 +2482,7 @@ static inline bool sk_fullsock(const struct sock *sk)
 
 /* Checks if this SKB belongs to an HW offloaded socket
  * and whether any SW fallbacks are required based on dev.
+ * Check decrypted mark in case skb_orphan() cleared socket.
  */
 static inline struct sk_buff *sk_validate_xmit_skb(struct sk_buff *skb,
                                                    struct net_device *dev)
@@ -2489,8 +2490,15 @@ static inline struct sk_buff *sk_validate_xmit_skb(struct sk_buff *skb,
 #ifdef CONFIG_SOCK_VALIDATE_XMIT
         struct sock *sk = skb->sk;
 
-        if (sk && sk_fullsock(sk) && sk->sk_validate_xmit_skb)
+        if (sk && sk_fullsock(sk) && sk->sk_validate_xmit_skb) {
                 skb = sk->sk_validate_xmit_skb(sk, dev, skb);
+#ifdef CONFIG_TLS_DEVICE
+        } else if (unlikely(skb->decrypted)) {
+                pr_warn_ratelimited("unencrypted skb with no associated socket - dropping\n");
+                kfree_skb(skb);
+                skb = NULL;
+#endif
+        }
 #endif
 
         return skb;
diff --git a/include/rdma/restrack.h b/include/rdma/restrack.h
index b0fc6b26bdf5..83df1ec6664e 100644
--- a/include/rdma/restrack.h
+++ b/include/rdma/restrack.h
@@ -105,8 +105,7 @@ struct rdma_restrack_entry {
 };
 
 int rdma_restrack_count(struct ib_device *dev,
-                        enum rdma_restrack_type type,
-                        struct pid_namespace *ns);
+                        enum rdma_restrack_type type);
 
 void rdma_restrack_kadd(struct rdma_restrack_entry *res);
 void rdma_restrack_uadd(struct rdma_restrack_entry *res);
diff --git a/include/soc/arc/mcip.h b/include/soc/arc/mcip.h
index 50f49e043668..d1a93c73f006 100644
--- a/include/soc/arc/mcip.h
+++ b/include/soc/arc/mcip.h
@@ -46,7 +46,9 @@ struct mcip_cmd {
 #define CMD_IDU_ENABLE                  0x71
 #define CMD_IDU_DISABLE                 0x72
 #define CMD_IDU_SET_MODE                0x74
+#define CMD_IDU_READ_MODE               0x75
 #define CMD_IDU_SET_DEST                0x76
+#define CMD_IDU_ACK_CIRQ                0x79
 #define CMD_IDU_SET_MASK                0x7C
 
 #define IDU_M_TRIG_LEVEL                0x0
@@ -119,4 +121,13 @@ static inline void __mcip_cmd_data(unsigned int cmd, unsigned int param,
         __mcip_cmd(cmd, param);
 }
 
+/*
+ * Read MCIP register
+ */
+static inline unsigned int __mcip_cmd_read(unsigned int cmd, unsigned int param)
+{
+        __mcip_cmd(cmd, param);
+        return read_aux_reg(ARC_REG_MCIP_READBACK);
+}
+
 #endif
diff --git a/include/soc/mediatek/smi.h b/include/soc/mediatek/smi.h
index 79b74ced9d91..5a34b87d89e3 100644
--- a/include/soc/mediatek/smi.h
+++ b/include/soc/mediatek/smi.h
@@ -20,11 +20,6 @@ struct mtk_smi_larb_iommu {
         unsigned int   mmu;
 };
 
-struct mtk_smi_iommu {
-        unsigned int larb_nr;
-        struct mtk_smi_larb_iommu larb_imu[MTK_LARB_NR_MAX];
-};
-
 /*
  * mtk_smi_larb_get: Enable the power domain and clocks for this local arbiter.
  *                   It also initialize some basic setting(like iommu).
diff --git a/include/trace/events/intel_iommu.h b/include/trace/events/intel_iommu.h
new file mode 100644
index 000000000000..54e61d456cdf
--- /dev/null
+++ b/include/trace/events/intel_iommu.h
@@ -0,0 +1,106 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Intel IOMMU trace support
+ *
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * Author: Lu Baolu <baolu.lu@linux.intel.com>
+ */
+#ifdef CONFIG_INTEL_IOMMU
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM intel_iommu
+
+#if !defined(_TRACE_INTEL_IOMMU_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_INTEL_IOMMU_H
+
+#include <linux/tracepoint.h>
+#include <linux/intel-iommu.h>
+
+DECLARE_EVENT_CLASS(dma_map,
+        TP_PROTO(struct device *dev, dma_addr_t dev_addr, phys_addr_t phys_addr,
+                 size_t size),
+
+        TP_ARGS(dev, dev_addr, phys_addr, size),
+
+        TP_STRUCT__entry(
+                __string(dev_name, dev_name(dev))
+                __field(dma_addr_t, dev_addr)
+                __field(phys_addr_t, phys_addr)
+                __field(size_t, size)
+        ),
+
+        TP_fast_assign(
+                __assign_str(dev_name, dev_name(dev));
+                __entry->dev_addr = dev_addr;
+                __entry->phys_addr = phys_addr;
+                __entry->size = size;
+        ),
+
+        TP_printk("dev=%s dev_addr=0x%llx phys_addr=0x%llx size=%zu",
+                  __get_str(dev_name),
+                  (unsigned long long)__entry->dev_addr,
+                  (unsigned long long)__entry->phys_addr,
+                  __entry->size)
+);
+
+DEFINE_EVENT(dma_map, map_single,
+        TP_PROTO(struct device *dev, dma_addr_t dev_addr, phys_addr_t phys_addr,
+                 size_t size),
+        TP_ARGS(dev, dev_addr, phys_addr, size)
+);
+
+DEFINE_EVENT(dma_map, map_sg,
+        TP_PROTO(struct device *dev, dma_addr_t dev_addr, phys_addr_t phys_addr,
+                 size_t size),
+        TP_ARGS(dev, dev_addr, phys_addr, size)
+);
+
+DEFINE_EVENT(dma_map, bounce_map_single,
+        TP_PROTO(struct device *dev, dma_addr_t dev_addr, phys_addr_t phys_addr,
+                 size_t size),
+        TP_ARGS(dev, dev_addr, phys_addr, size)
+);
+
+DECLARE_EVENT_CLASS(dma_unmap,
+        TP_PROTO(struct device *dev, dma_addr_t dev_addr, size_t size),
+
+        TP_ARGS(dev, dev_addr, size),
+
+        TP_STRUCT__entry(
+                __string(dev_name, dev_name(dev))
+                __field(dma_addr_t, dev_addr)
+                __field(size_t, size)
+        ),
+
+        TP_fast_assign(
+                __assign_str(dev_name, dev_name(dev));
+                __entry->dev_addr = dev_addr;
+                __entry->size = size;
+        ),
+
+        TP_printk("dev=%s dev_addr=0x%llx size=%zu",
+                  __get_str(dev_name),
+                  (unsigned long long)__entry->dev_addr,
+                  __entry->size)
+);
+
+DEFINE_EVENT(dma_unmap, unmap_single,
+        TP_PROTO(struct device *dev, dma_addr_t dev_addr, size_t size),
+        TP_ARGS(dev, dev_addr, size)
+);
+
+DEFINE_EVENT(dma_unmap, unmap_sg,
+        TP_PROTO(struct device *dev, dma_addr_t dev_addr, size_t size),
+        TP_ARGS(dev, dev_addr, size)
+);
+
+DEFINE_EVENT(dma_unmap, bounce_unmap_single,
+        TP_PROTO(struct device *dev, dma_addr_t dev_addr, size_t size),
+        TP_ARGS(dev, dev_addr, size)
+);
+
+#endif /* _TRACE_INTEL_IOMMU_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
+#endif /* CONFIG_INTEL_IOMMU */
diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
index cc1d060cbf13..a13a62db3565 100644
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -23,20 +23,17 @@
 #define __RXRPC_DECLARE_TRACE_ENUMS_ONCE_ONLY
 
 enum rxrpc_skb_trace {
-        rxrpc_skb_rx_cleaned,
-        rxrpc_skb_rx_freed,
-        rxrpc_skb_rx_got,
-        rxrpc_skb_rx_lost,
-        rxrpc_skb_rx_purged,
-        rxrpc_skb_rx_received,
-        rxrpc_skb_rx_rotated,
-        rxrpc_skb_rx_seen,
-        rxrpc_skb_tx_cleaned,
-        rxrpc_skb_tx_freed,
-        rxrpc_skb_tx_got,
-        rxrpc_skb_tx_new,
-        rxrpc_skb_tx_rotated,
-        rxrpc_skb_tx_seen,
+        rxrpc_skb_cleaned,
+        rxrpc_skb_freed,
+        rxrpc_skb_got,
+        rxrpc_skb_lost,
+        rxrpc_skb_new,
+        rxrpc_skb_purged,
+        rxrpc_skb_received,
+        rxrpc_skb_rotated,
+        rxrpc_skb_seen,
+        rxrpc_skb_unshared,
+        rxrpc_skb_unshared_nomem,
 };
 
 enum rxrpc_local_trace {
@@ -228,20 +225,17 @@ enum rxrpc_tx_point {
  * Declare tracing information enums and their string mappings for display.
  */
 #define rxrpc_skb_traces \
-        EM(rxrpc_skb_rx_cleaned,                "Rx CLN") \
-        EM(rxrpc_skb_rx_freed,                  "Rx FRE") \
-        EM(rxrpc_skb_rx_got,                    "Rx GOT") \
-        EM(rxrpc_skb_rx_lost,                   "Rx *L*") \
-        EM(rxrpc_skb_rx_purged,                 "Rx PUR") \
-        EM(rxrpc_skb_rx_received,               "Rx RCV") \
-        EM(rxrpc_skb_rx_rotated,                "Rx ROT") \
-        EM(rxrpc_skb_rx_seen,                   "Rx SEE") \
-        EM(rxrpc_skb_tx_cleaned,                "Tx CLN") \
-        EM(rxrpc_skb_tx_freed,                  "Tx FRE") \
-        EM(rxrpc_skb_tx_got,                    "Tx GOT") \
-        EM(rxrpc_skb_tx_new,                    "Tx NEW") \
-        EM(rxrpc_skb_tx_rotated,                "Tx ROT") \
-        E_(rxrpc_skb_tx_seen,                   "Tx SEE")
+        EM(rxrpc_skb_cleaned,                   "CLN") \
+        EM(rxrpc_skb_freed,                     "FRE") \
+        EM(rxrpc_skb_got,                       "GOT") \
+        EM(rxrpc_skb_lost,                      "*L*") \
+        EM(rxrpc_skb_new,                       "NEW") \
+        EM(rxrpc_skb_purged,                    "PUR") \
+        EM(rxrpc_skb_received,                  "RCV") \
+        EM(rxrpc_skb_rotated,                   "ROT") \
+        EM(rxrpc_skb_seen,                      "SEE") \
+        EM(rxrpc_skb_unshared,                  "UNS") \
+        E_(rxrpc_skb_unshared_nomem,            "US0")
 
 #define rxrpc_local_traces \
         EM(rxrpc_local_got,                     "GOT") \
@@ -498,10 +492,10 @@ rxrpc_tx_points;
 #define E_(a, b)        { a, b }
 
 TRACE_EVENT(rxrpc_local,
-            TP_PROTO(struct rxrpc_local *local, enum rxrpc_local_trace op,
+            TP_PROTO(unsigned int local_debug_id, enum rxrpc_local_trace op,
                      int usage, const void *where),
 
-            TP_ARGS(local, op, usage, where),
+            TP_ARGS(local_debug_id, op, usage, where),
 
             TP_STRUCT__entry(
                     __field(unsigned int,       local           )
@@ -511,7 +505,7 @@ TRACE_EVENT(rxrpc_local,
                              ),
 
             TP_fast_assign(
-                    __entry->local = local->debug_id;
+                    __entry->local = local_debug_id;
                     __entry->op = op;
                     __entry->usage = usage;
                     __entry->where = where;
@@ -643,13 +637,14 @@ TRACE_EVENT(rxrpc_call,
 
 TRACE_EVENT(rxrpc_skb,
             TP_PROTO(struct sk_buff *skb, enum rxrpc_skb_trace op,
-                     int usage, int mod_count, const void *where),
+                     int usage, int mod_count, u8 flags,    const void *where),
 
-            TP_ARGS(skb, op, usage, mod_count, where),
+            TP_ARGS(skb, op, usage, mod_count, flags, where),
 
             TP_STRUCT__entry(
                     __field(struct sk_buff *,           skb             )
                     __field(enum rxrpc_skb_trace,       op              )
+                    __field(u8,                         flags           )
                     __field(int,                        usage           )
                     __field(int,                        mod_count       )
                     __field(const void *,               where           )
@@ -657,14 +652,16 @@ TRACE_EVENT(rxrpc_skb,
 
             TP_fast_assign(
                     __entry->skb = skb;
+                    __entry->flags = flags;
                     __entry->op = op;
                     __entry->usage = usage;
                     __entry->mod_count = mod_count;
                     __entry->where = where;
                            ),
 
-            TP_printk("s=%p %s u=%d m=%d p=%pSR",
+            TP_printk("s=%p %cx %s u=%d m=%d p=%pSR",
                       __entry->skb,
+                      __entry->flags & RXRPC_SKB_TX_BUFFER ? 'T' : 'R',
                       __print_symbolic(__entry->op, rxrpc_skb_traces),
                       __entry->usage,
                       __entry->mod_count,
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index fa1c753dcdbc..a5aa7d3ac6a1 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1466,8 +1466,8 @@ union bpf_attr {
  *              If no cookie has been set yet, generate a new cookie. Once
  *              generated, the socket cookie remains stable for the life of the
  *              socket. This helper can be useful for monitoring per socket
- *              networking traffic statistics as it provides a unique socket
- *              identifier per namespace.
+ *              networking traffic statistics as it provides a global socket
+ *              identifier that can be assumed unique.
  *      Return
  *              A 8-byte long non-decreasing number on success, or 0 if the
  *              socket field is missing inside *skb*.
diff --git a/include/uapi/linux/jffs2.h b/include/uapi/linux/jffs2.h
index a18b719f49d4..784ba0b9690a 100644
--- a/include/uapi/linux/jffs2.h
+++ b/include/uapi/linux/jffs2.h
@@ -77,11 +77,6 @@
 
 #define JFFS2_ACL_VERSION               0x0001
 
-// Maybe later...
-//#define JFFS2_NODETYPE_CHECKPOINT (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3)
-//#define JFFS2_NODETYPE_OPTIONS (JFFS2_FEATURE_RWCOMPAT_COPY | JFFS2_NODE_ACCURATE | 4)
-
-
 #define JFFS2_INO_FLAG_PREREAD    1     /* Do read_inode() for this one at
                                            mount time, don't wait for it to
                                            happen later */
diff --git a/include/uapi/linux/netfilter/xt_nfacct.h b/include/uapi/linux/netfilter/xt_nfacct.h
index 5c8a4d760ee3..b5123ab8d54a 100644
--- a/include/uapi/linux/netfilter/xt_nfacct.h
+++ b/include/uapi/linux/netfilter/xt_nfacct.h
@@ -11,4 +11,9 @@ struct xt_nfacct_match_info {
         struct nf_acct  *nfacct;
 };
 
+struct xt_nfacct_match_info_v1 {
+        char            name[NFACCT_NAME_MAX];
+        struct nf_acct  *nfacct __attribute__((aligned(8)));
+};
+
 #endif /* _XT_NFACCT_MATCH_H */
diff --git a/include/uapi/linux/rds.h b/include/uapi/linux/rds.h
index fd6b5f66e2c5..cba368e55863 100644
--- a/include/uapi/linux/rds.h
+++ b/include/uapi/linux/rds.h
@@ -250,6 +250,7 @@ struct rds_info_rdma_connection {
         __u32           rdma_mr_max;
         __u32           rdma_mr_size;
         __u8            tos;
+        __u8            sl;
         __u32           cache_allocs;
 };
 
@@ -265,6 +266,7 @@ struct rds6_info_rdma_connection {
         __u32           rdma_mr_max;
         __u32           rdma_mr_size;
         __u8            tos;
+        __u8            sl;
         __u32           cache_allocs;
 };
 
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 8191a7db2777..66088a9e9b9e 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -890,7 +890,8 @@ int bpf_jit_get_func_addr(const struct bpf_prog *prog,
 
 static int bpf_jit_blind_insn(const struct bpf_insn *from,
                               const struct bpf_insn *aux,
-                              struct bpf_insn *to_buff)
+                              struct bpf_insn *to_buff,
+                              bool emit_zext)
 {
         struct bpf_insn *to = to_buff;
         u32 imm_rnd = get_random_int();
@@ -1005,6 +1006,8 @@ static int bpf_jit_blind_insn(const struct bpf_insn *from,
         case 0: /* Part 2 of BPF_LD | BPF_IMM | BPF_DW. */
                 *to++ = BPF_ALU32_IMM(BPF_MOV, BPF_REG_AX, imm_rnd ^ aux[0].imm);
                 *to++ = BPF_ALU32_IMM(BPF_XOR, BPF_REG_AX, imm_rnd);
+                if (emit_zext)
+                        *to++ = BPF_ZEXT_REG(BPF_REG_AX);
                 *to++ = BPF_ALU64_REG(BPF_OR,  aux[0].dst_reg, BPF_REG_AX);
                 break;
 
@@ -1088,7 +1091,8 @@ struct bpf_prog *bpf_jit_blind_constants(struct bpf_prog *prog)
                     insn[1].code == 0)
                         memcpy(aux, insn, sizeof(aux));
 
-                rewritten = bpf_jit_blind_insn(insn, aux, insn_buff);
+                rewritten = bpf_jit_blind_insn(insn, aux, insn_buff,
+                                                clone->aux->verifier_zext);
                 if (!rewritten)
                         continue;
 
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 5d141f16f6fa..272071e9112f 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1707,20 +1707,26 @@ static int bpf_prog_load(union bpf_attr *attr, union bpf_attr __user *uattr)
         if (err)
                 goto free_used_maps;
 
-        err = bpf_prog_new_fd(prog);
-        if (err < 0) {
-                /* failed to allocate fd.
-                 * bpf_prog_put() is needed because the above
-                 * bpf_prog_alloc_id() has published the prog
-                 * to the userspace and the userspace may
-                 * have refcnt-ed it through BPF_PROG_GET_FD_BY_ID.
-                 */
-                bpf_prog_put(prog);
-                return err;
-        }
-
+        /* Upon success of bpf_prog_alloc_id(), the BPF prog is
+         * effectively publicly exposed. However, retrieving via
+         * bpf_prog_get_fd_by_id() will take another reference,
+         * therefore it cannot be gone underneath us.
+         *
+         * Only for the time /after/ successful bpf_prog_new_fd()
+         * and before returning to userspace, we might just hold
+         * one reference and any parallel close on that fd could
+         * rip everything out. Hence, below notifications must
+         * happen before bpf_prog_new_fd().
+         *
+         * Also, any failure handling from this point onwards must
+         * be using bpf_prog_put() given the program is exposed.
+         */
         bpf_prog_kallsyms_add(prog);
         perf_event_bpf_event(prog, PERF_BPF_EVENT_PROG_LOAD, 0);
+
+        err = bpf_prog_new_fd(prog);
+        if (err < 0)
+                bpf_prog_put(prog);
         return err;
 
 free_used_maps:
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index c84d83f86141..b5c14c9d7b98 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -985,9 +985,6 @@ static void __mark_reg_unbounded(struct bpf_reg_state *reg)
         reg->smax_value = S64_MAX;
         reg->umin_value = 0;
         reg->umax_value = U64_MAX;
-
-        /* constant backtracking is enabled for root only for now */
-        reg->precise = capable(CAP_SYS_ADMIN) ? false : true;
 }
 
 /* Mark a register as having a completely unknown (scalar) value. */
@@ -1014,7 +1011,11 @@ static void mark_reg_unknown(struct bpf_verifier_env *env,
                         __mark_reg_not_init(regs + regno);
                 return;
         }
-        __mark_reg_unknown(regs + regno);
+        regs += regno;
+        __mark_reg_unknown(regs);
+        /* constant backtracking is enabled for root without bpf2bpf calls */
+        regs->precise = env->subprog_cnt > 1 || !env->allow_ptr_leaks ?
+                        true : false;
 }
 
 static void __mark_reg_not_init(struct bpf_reg_state *reg)
diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
index 2bd410f934b3..69cfb4345388 100644
--- a/kernel/dma/contiguous.c
+++ b/kernel/dma/contiguous.c
@@ -230,9 +230,7 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages,
  */
 struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t gfp)
 {
-        int node = dev ? dev_to_node(dev) : NUMA_NO_NODE;
-        size_t count = PAGE_ALIGN(size) >> PAGE_SHIFT;
-        size_t align = get_order(PAGE_ALIGN(size));
+        size_t count = size >> PAGE_SHIFT;
         struct page *page = NULL;
         struct cma *cma = NULL;
 
@@ -243,14 +241,12 @@ struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t gfp)
 
         /* CMA can be used only in the context which permits sleeping */
         if (cma && gfpflags_allow_blocking(gfp)) {
+                size_t align = get_order(size);
                 size_t cma_align = min_t(size_t, align, CONFIG_CMA_ALIGNMENT);
 
                 page = cma_alloc(cma, count, cma_align, gfp & __GFP_NOWARN);
         }
 
-        /* Fallback allocation of normal pages */
-        if (!page)
-                page = alloc_pages_node(node, gfp, align);
         return page;
 }
 
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 795c9b095d75..8402b29c280f 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -85,6 +85,8 @@ static bool dma_coherent_ok(struct device *dev, phys_addr_t phys, size_t size)
 struct page *__dma_direct_alloc_pages(struct device *dev, size_t size,
                 dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)
 {
+        size_t alloc_size = PAGE_ALIGN(size);
+        int node = dev_to_node(dev);
         struct page *page = NULL;
         u64 phys_mask;
 
@@ -95,8 +97,14 @@ struct page *__dma_direct_alloc_pages(struct device *dev, size_t size,
         gfp &= ~__GFP_ZERO;
         gfp |= __dma_direct_optimal_gfp_mask(dev, dev->coherent_dma_mask,
                         &phys_mask);
+        page = dma_alloc_contiguous(dev, alloc_size, gfp);
+        if (page && !dma_coherent_ok(dev, page_to_phys(page), size)) {
+                dma_free_contiguous(dev, page, alloc_size);
+                page = NULL;
+        }
 again:
-        page = dma_alloc_contiguous(dev, size, gfp);
+        if (!page)
+                page = alloc_pages_node(node, gfp, get_order(alloc_size));
         if (page && !dma_coherent_ok(dev, page_to_phys(page), size)) {
                 dma_free_contiguous(dev, page, size);
                 page = NULL;
@@ -297,7 +305,7 @@ void dma_direct_unmap_page(struct device *dev, dma_addr_t addr,
                 dma_direct_sync_single_for_cpu(dev, addr, size, dir);
 
         if (unlikely(is_swiotlb_buffer(phys)))
-                swiotlb_tbl_unmap_single(dev, phys, size, dir, attrs);
+                swiotlb_tbl_unmap_single(dev, phys, size, size, dir, attrs);
 }
 EXPORT_SYMBOL(dma_direct_unmap_page);
 
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 9de232229063..796a44f8ef5a 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -444,7 +444,9 @@ static void swiotlb_bounce(phys_addr_t orig_addr, phys_addr_t tlb_addr,
 
 phys_addr_t swiotlb_tbl_map_single(struct device *hwdev,
                                    dma_addr_t tbl_dma_addr,
-                                   phys_addr_t orig_addr, size_t size,
+                                   phys_addr_t orig_addr,
+                                   size_t mapping_size,
+                                   size_t alloc_size,
                                    enum dma_data_direction dir,
                                    unsigned long attrs)
 {
@@ -464,6 +466,12 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev,
                 pr_warn_once("%s is active and system is using DMA bounce buffers\n",
                              sme_active() ? "SME" : "SEV");
 
+        if (mapping_size > alloc_size) {
+                dev_warn_once(hwdev, "Invalid sizes (mapping: %zd bytes, alloc: %zd bytes)",
+                              mapping_size, alloc_size);
+                return (phys_addr_t)DMA_MAPPING_ERROR;
+        }
+
         mask = dma_get_seg_boundary(hwdev);
 
         tbl_dma_addr &= mask;
@@ -471,8 +479,8 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev,
         offset_slots = ALIGN(tbl_dma_addr, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
 
         /*
-         * Carefully handle integer overflow which can occur when mask == ~0UL.
-         */
+         * Carefully handle integer overflow which can occur when mask == ~0UL.
+         */
         max_slots = mask + 1
                     ? ALIGN(mask + 1, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT
                     : 1UL << (BITS_PER_LONG - IO_TLB_SHIFT);
@@ -481,8 +489,8 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev,
          * For mappings greater than or equal to a page, we limit the stride
          * (and hence alignment) to a page size.
          */
-        nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
-        if (size >= PAGE_SIZE)
+        nslots = ALIGN(alloc_size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
+        if (alloc_size >= PAGE_SIZE)
                 stride = (1 << (PAGE_SHIFT - IO_TLB_SHIFT));
         else
                 stride = 1;
@@ -547,7 +555,7 @@ not_found:
         spin_unlock_irqrestore(&io_tlb_lock, flags);
         if (!(attrs & DMA_ATTR_NO_WARN) && printk_ratelimit())
                 dev_warn(hwdev, "swiotlb buffer is full (sz: %zd bytes), total %lu (slots), used %lu (slots)\n",
-                         size, io_tlb_nslabs, tmp_io_tlb_used);
+                         alloc_size, io_tlb_nslabs, tmp_io_tlb_used);
         return (phys_addr_t)DMA_MAPPING_ERROR;
 found:
         io_tlb_used += nslots;
@@ -562,7 +570,7 @@ found:
                 io_tlb_orig_addr[index+i] = orig_addr + (i << IO_TLB_SHIFT);
         if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&
             (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL))
-                swiotlb_bounce(orig_addr, tlb_addr, size, DMA_TO_DEVICE);
+                swiotlb_bounce(orig_addr, tlb_addr, mapping_size, DMA_TO_DEVICE);
 
         return tlb_addr;
 }
@@ -571,11 +579,11 @@ found:
  * tlb_addr is the physical address of the bounce buffer to unmap.
  */
 void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,
-                              size_t size, enum dma_data_direction dir,
-                              unsigned long attrs)
+                              size_t mapping_size, size_t alloc_size,
+                              enum dma_data_direction dir, unsigned long attrs)
 {
         unsigned long flags;
-        int i, count, nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
+        int i, count, nslots = ALIGN(alloc_size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
         int index = (tlb_addr - io_tlb_start) >> IO_TLB_SHIFT;
         phys_addr_t orig_addr = io_tlb_orig_addr[index];
 
@@ -585,7 +593,7 @@ void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,
         if (orig_addr != INVALID_PHYS_ADDR &&
             !(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&
             ((dir == DMA_FROM_DEVICE) || (dir == DMA_BIDIRECTIONAL)))
-                swiotlb_bounce(orig_addr, tlb_addr, size, DMA_FROM_DEVICE);
+                swiotlb_bounce(orig_addr, tlb_addr, mapping_size, DMA_FROM_DEVICE);
 
         /*
          * Return the buffer to the free list by setting the corresponding
@@ -665,14 +673,14 @@ bool swiotlb_map(struct device *dev, phys_addr_t *phys, dma_addr_t *dma_addr,
 
         /* Oh well, have to allocate and map a bounce buffer. */
         *phys = swiotlb_tbl_map_single(dev, __phys_to_dma(dev, io_tlb_start),
-                        *phys, size, dir, attrs);
+                        *phys, size, size, dir, attrs);
         if (*phys == (phys_addr_t)DMA_MAPPING_ERROR)
                 return false;
 
         /* Ensure that the address returned is DMA'ble */
         *dma_addr = __phys_to_dma(dev, *phys);
         if (unlikely(!dma_capable(dev, *dma_addr, size))) {
-                swiotlb_tbl_unmap_single(dev, *phys, size, dir,
+                swiotlb_tbl_unmap_single(dev, *phys, size, size, dir,
                         attrs | DMA_ATTR_SKIP_CPU_SYNC);
                 return false;
         }
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index 9484e88dabc2..9be995fc3c5a 100644
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -295,6 +295,18 @@ static void irq_sysfs_add(int irq, struct irq_desc *desc)
         }
 }
 
+static void irq_sysfs_del(struct irq_desc *desc)
+{
+        /*
+         * If irq_sysfs_init() has not yet been invoked (early boot), then
+         * irq_kobj_base is NULL and the descriptor was never added.
+         * kobject_del() complains about a object with no parent, so make
+         * it conditional.
+         */
+        if (irq_kobj_base)
+                kobject_del(&desc->kobj);
+}
+
 static int __init irq_sysfs_init(void)
 {
         struct irq_desc *desc;
@@ -325,6 +337,7 @@ static struct kobj_type irq_kobj_type = {
 };
 
 static void irq_sysfs_add(int irq, struct irq_desc *desc) {}
+static void irq_sysfs_del(struct irq_desc *desc) {}
 
 #endif /* CONFIG_SYSFS */
 
@@ -438,7 +451,7 @@ static void free_desc(unsigned int irq)
          * The sysfs entry must be serialized against a concurrent
          * irq_sysfs_init() as well.
          */
-        kobject_del(&desc->kobj);
+        irq_sysfs_del(desc);
         delete_irq_desc(irq);
 
         /*
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index 95a260f9214b..136ce049c4ad 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -263,8 +263,10 @@ int kallsyms_lookup_size_offset(unsigned long addr, unsigned long *symbolsize,
 {
         char namebuf[KSYM_NAME_LEN];
 
-        if (is_ksym_addr(addr))
-                return !!get_symbol_pos(addr, symbolsize, offset);
+        if (is_ksym_addr(addr)) {
+                get_symbol_pos(addr, symbolsize, offset);
+                return 1;
+        }
         return !!module_address_lookup(addr, symbolsize, offset, NULL, namebuf) ||
                !!__bpf_address_lookup(addr, symbolsize, offset, namebuf);
 }
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 9873fc627d61..d9770a5393c8 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -470,6 +470,7 @@ static DECLARE_DELAYED_WORK(optimizing_work, kprobe_optimizer);
  */
 static void do_optimize_kprobes(void)
 {
+        lockdep_assert_held(&text_mutex);
         /*
          * The optimization/unoptimization refers online_cpus via
          * stop_machine() and cpu-hotplug modifies online_cpus.
@@ -487,9 +488,7 @@ static void do_optimize_kprobes(void)
             list_empty(&optimizing_list))
                 return;
 
-        mutex_lock(&text_mutex);
         arch_optimize_kprobes(&optimizing_list);
-        mutex_unlock(&text_mutex);
 }
 
 /*
@@ -500,6 +499,7 @@ static void do_unoptimize_kprobes(void)
 {
         struct optimized_kprobe *op, *tmp;
 
+        lockdep_assert_held(&text_mutex);
         /* See comment in do_optimize_kprobes() */
         lockdep_assert_cpus_held();
 
@@ -507,7 +507,6 @@ static void do_unoptimize_kprobes(void)
         if (list_empty(&unoptimizing_list))
                 return;
 
-        mutex_lock(&text_mutex);
         arch_unoptimize_kprobes(&unoptimizing_list, &freeing_list);
         /* Loop free_list for disarming */
         list_for_each_entry_safe(op, tmp, &freeing_list, list) {
@@ -524,7 +523,6 @@ static void do_unoptimize_kprobes(void)
                 } else
                         list_del_init(&op->list);
         }
-        mutex_unlock(&text_mutex);
 }
 
 /* Reclaim all kprobes on the free_list */
@@ -556,6 +554,7 @@ static void kprobe_optimizer(struct work_struct *work)
 {
         mutex_lock(&kprobe_mutex);
         cpus_read_lock();
+        mutex_lock(&text_mutex);
         /* Lock modules while optimizing kprobes */
         mutex_lock(&module_mutex);
 
@@ -583,6 +582,7 @@ static void kprobe_optimizer(struct work_struct *work)
         do_free_cleaned_kprobes();
 
         mutex_unlock(&module_mutex);
+        mutex_unlock(&text_mutex);
         cpus_read_unlock();
         mutex_unlock(&kprobe_mutex);
 
diff --git a/kernel/module.c b/kernel/module.c
index 5933395af9a0..9ee93421269c 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -65,9 +65,9 @@
 /*
  * Modules' sections will be aligned on page boundaries
  * to ensure complete separation of code and data, but
- * only when CONFIG_STRICT_MODULE_RWX=y
+ * only when CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
  */
-#ifdef CONFIG_STRICT_MODULE_RWX
+#ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX
 # define debug_align(X) ALIGN(X, PAGE_SIZE)
 #else
 # define debug_align(X) (X)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 2b037f195473..df9f1fe5689b 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3904,7 +3904,7 @@ void __noreturn do_task_dead(void)
 
 static inline void sched_submit_work(struct task_struct *tsk)
 {
-        if (!tsk->state || tsk_is_pi_blocked(tsk))
+        if (!tsk->state)
                 return;
 
         /*
@@ -3920,6 +3920,9 @@ static inline void sched_submit_work(struct task_struct *tsk)
                 preempt_enable_no_resched();
         }
 
+        if (tsk_is_pi_blocked(tsk))
+                return;
+
         /*
          * If we are going to sleep and we have plugged IO queued,
          * make sure to submit it to avoid deadlocks.
@@ -5102,37 +5105,40 @@ out_unlock:
         return retval;
 }
 
-static int sched_read_attr(struct sched_attr __user *uattr,
-                           struct sched_attr *attr,
-                           unsigned int usize)
+/*
+ * Copy the kernel size attribute structure (which might be larger
+ * than what user-space knows about) to user-space.
+ *
+ * Note that all cases are valid: user-space buffer can be larger or
+ * smaller than the kernel-space buffer. The usual case is that both
+ * have the same size.
+ */
+static int
+sched_attr_copy_to_user(struct sched_attr __user *uattr,
+                        struct sched_attr *kattr,
+                        unsigned int usize)
 {
-        int ret;
+        unsigned int ksize = sizeof(*kattr);
 
         if (!access_ok(uattr, usize))
                 return -EFAULT;
 
         /*
-         * If we're handed a smaller struct than we know of,
-         * ensure all the unknown bits are 0 - i.e. old
-         * user-space does not get uncomplete information.
+         * sched_getattr() ABI forwards and backwards compatibility:
+         *
+         * If usize == ksize then we just copy everything to user-space and all is good.
+         *
+         * If usize < ksize then we only copy as much as user-space has space for,
+         * this keeps ABI compatibility as well. We skip the rest.
+         *
+         * If usize > ksize then user-space is using a newer version of the ABI,
+         * which part the kernel doesn't know about. Just ignore it - tooling can
+         * detect the kernel's knowledge of attributes from the attr->size value
+         * which is set to ksize in this case.
          */
-        if (usize < sizeof(*attr)) {
-                unsigned char *addr;
-                unsigned char *end;
-
-                addr = (void *)attr + usize;
-                end  = (void *)attr + sizeof(*attr);
+        kattr->size = min(usize, ksize);
 
-                for (; addr < end; addr++) {
-                        if (*addr)
-                                return -EFBIG;
-                }
-
-                attr->size = usize;
-        }
-
-        ret = copy_to_user(uattr, attr, attr->size);
-        if (ret)
+        if (copy_to_user(uattr, kattr, kattr->size))
                 return -EFAULT;
 
         return 0;
@@ -5142,20 +5148,18 @@ static int sched_read_attr(struct sched_attr __user *uattr,
  * sys_sched_getattr - similar to sched_getparam, but with sched_attr
  * @pid: the pid in question.
  * @uattr: structure containing the extended parameters.
- * @size: sizeof(attr) for fwd/bwd comp.
+ * @usize: sizeof(attr) that user-space knows about, for forwards and backwards compatibility.
  * @flags: for future extension.
  */
 SYSCALL_DEFINE4(sched_getattr, pid_t, pid, struct sched_attr __user *, uattr,
-                unsigned int, size, unsigned int, flags)
+                unsigned int, usize, unsigned int, flags)
 {
-        struct sched_attr attr = {
-                .size = sizeof(struct sched_attr),
-        };
+        struct sched_attr kattr = { };
         struct task_struct *p;
         int retval;
 
-        if (!uattr || pid < 0 || size > PAGE_SIZE ||
-            size < SCHED_ATTR_SIZE_VER0 || flags)
+        if (!uattr || pid < 0 || usize > PAGE_SIZE ||
+            usize < SCHED_ATTR_SIZE_VER0 || flags)
                 return -EINVAL;
 
         rcu_read_lock();
@@ -5168,25 +5172,24 @@ SYSCALL_DEFINE4(sched_getattr, pid_t, pid, struct sched_attr __user *, uattr,
         if (retval)
                 goto out_unlock;
 
-        attr.sched_policy = p->policy;
+        kattr.sched_policy = p->policy;
         if (p->sched_reset_on_fork)
-                attr.sched_flags |= SCHED_FLAG_RESET_ON_FORK;
+                kattr.sched_flags |= SCHED_FLAG_RESET_ON_FORK;
         if (task_has_dl_policy(p))
-                __getparam_dl(p, &attr);
+                __getparam_dl(p, &kattr);
         else if (task_has_rt_policy(p))
-                attr.sched_priority = p->rt_priority;
+                kattr.sched_priority = p->rt_priority;
         else
-                attr.sched_nice = task_nice(p);
+                kattr.sched_nice = task_nice(p);
 
 #ifdef CONFIG_UCLAMP_TASK
-        attr.sched_util_min = p->uclamp_req[UCLAMP_MIN].value;
-        attr.sched_util_max = p->uclamp_req[UCLAMP_MAX].value;
+        kattr.sched_util_min = p->uclamp_req[UCLAMP_MIN].value;
+        kattr.sched_util_max = p->uclamp_req[UCLAMP_MAX].value;
 #endif
 
         rcu_read_unlock();
 
-        retval = sched_read_attr(uattr, &attr, size);
-        return retval;
+        return sched_attr_copy_to_user(uattr, &kattr, usize);
 
 out_unlock:
         rcu_read_unlock();
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index bc9cfeaac8bd..500f5db0de0b 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4470,6 +4470,8 @@ static void __account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec)
         if (likely(cfs_rq->runtime_remaining > 0))
                 return;
 
+        if (cfs_rq->throttled)
+                return;
         /*
          * if we're unable to extend our runtime we resched so that the active
          * hierarchy can be throttled
@@ -4673,6 +4675,9 @@ static u64 distribute_cfs_runtime(struct cfs_bandwidth *cfs_b,
                 if (!cfs_rq_throttled(cfs_rq))
                         goto next;
 
+                /* By the above check, this should never be true */
+                SCHED_WARN_ON(cfs_rq->runtime_remaining > 0);
+
                 runtime = -cfs_rq->runtime_remaining + 1;
                 if (runtime > remaining)
                         runtime = remaining;
diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
index 23fbbcc414d5..6e52b67b420e 100644
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@ -1131,7 +1131,15 @@ static void psi_trigger_destroy(struct kref *ref)
          * deadlock while waiting for psi_poll_work to acquire trigger_lock
          */
         if (kworker_to_destroy) {
+                /*
+                 * After the RCU grace period has expired, the worker
+                 * can no longer be found through group->poll_kworker.
+                 * But it might have been already scheduled before
+                 * that - deschedule it cleanly before destroying it.
+                 */
                 kthread_cancel_delayed_work_sync(&group->poll_work);
+                atomic_set(&group->poll_scheduled, 0);
+
                 kthread_destroy_worker(kworker_to_destroy);
         }
         kfree(t);
diff --git a/kernel/signal.c b/kernel/signal.c
index e667be6907d7..534fec266a33 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -90,6 +90,11 @@ static bool sig_task_ignored(struct task_struct *t, int sig, bool force)
             handler == SIG_DFL && !(force && sig_kernel_only(sig)))
                 return true;
 
+        /* Only allow kernel generated signals to this kthread */
+        if (unlikely((t->flags & PF_KTHREAD) &&
+                     (handler == SIG_KTHREAD_KERNEL) && !force))
+                return true;
+
         return sig_handler_ignored(handler, sig);
 }
 
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index d911c8470149..ca69290bee2a 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -146,6 +146,11 @@ static void tk_set_wall_to_mono(struct timekeeper *tk, struct timespec64 wtm)
 static inline void tk_update_sleep_time(struct timekeeper *tk, ktime_t delta)
 {
         tk->offs_boot = ktime_add(tk->offs_boot, delta);
+        /*
+         * Timespec representation for VDSO update to avoid 64bit division
+         * on every update.
+         */
+        tk->monotonic_to_boot = ktime_to_timespec64(tk->offs_boot);
 }
 
 /*
diff --git a/kernel/time/vsyscall.c b/kernel/time/vsyscall.c
index 8cf3596a4ce6..4bc37ac3bb05 100644
--- a/kernel/time/vsyscall.c
+++ b/kernel/time/vsyscall.c
@@ -17,7 +17,7 @@ static inline void update_vdso_data(struct vdso_data *vdata,
                                     struct timekeeper *tk)
 {
         struct vdso_timestamp *vdso_ts;
-        u64 nsec;
+        u64 nsec, sec;
 
         vdata[CS_HRES_COARSE].cycle_last        = tk->tkr_mono.cycle_last;
         vdata[CS_HRES_COARSE].mask              = tk->tkr_mono.mask;
@@ -45,23 +45,27 @@ static inline void update_vdso_data(struct vdso_data *vdata,
         }
         vdso_ts->nsec   = nsec;
 
-        /* CLOCK_MONOTONIC_RAW */
-        vdso_ts         = &vdata[CS_RAW].basetime[CLOCK_MONOTONIC_RAW];
-        vdso_ts->sec    = tk->raw_sec;
-        vdso_ts->nsec   = tk->tkr_raw.xtime_nsec;
+        /* Copy MONOTONIC time for BOOTTIME */
+        sec     = vdso_ts->sec;
+        /* Add the boot offset */
+        sec     += tk->monotonic_to_boot.tv_sec;
+        nsec    += (u64)tk->monotonic_to_boot.tv_nsec << tk->tkr_mono.shift;
 
         /* CLOCK_BOOTTIME */
         vdso_ts         = &vdata[CS_HRES_COARSE].basetime[CLOCK_BOOTTIME];
-        vdso_ts->sec    = tk->xtime_sec + tk->wall_to_monotonic.tv_sec;
-        nsec = tk->tkr_mono.xtime_nsec;
-        nsec += ((u64)(tk->wall_to_monotonic.tv_nsec +
-                       ktime_to_ns(tk->offs_boot)) << tk->tkr_mono.shift);
+        vdso_ts->sec    = sec;
+
         while (nsec >= (((u64)NSEC_PER_SEC) << tk->tkr_mono.shift)) {
                 nsec -= (((u64)NSEC_PER_SEC) << tk->tkr_mono.shift);
                 vdso_ts->sec++;
         }
         vdso_ts->nsec   = nsec;
 
+        /* CLOCK_MONOTONIC_RAW */
+        vdso_ts         = &vdata[CS_RAW].basetime[CLOCK_MONOTONIC_RAW];
+        vdso_ts->sec    = tk->raw_sec;
+        vdso_ts->nsec   = tk->tkr_raw.xtime_nsec;
+
         /* CLOCK_TAI */
         vdso_ts         = &vdata[CS_HRES_COARSE].basetime[CLOCK_TAI];
         vdso_ts->sec    = tk->xtime_sec + (s64)tk->tai_offset;
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index eca34503f178..f9821a3374e9 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -3095,6 +3095,14 @@ t_probe_next(struct seq_file *m, loff_t *pos)
                 hnd = &iter->probe_entry->hlist;
 
         hash = iter->probe->ops.func_hash->filter_hash;
+
+        /*
+         * A probe being registered may temporarily have an empty hash
+         * and it's at the end of the func_probes list.
+         */
+        if (!hash || hash == EMPTY_HASH)
+                return NULL;
+
         size = 1 << hash->size_bits;
 
  retry:
@@ -4320,12 +4328,21 @@ register_ftrace_function_probe(char *glob, struct trace_array *tr,
 
         mutex_unlock(&ftrace_lock);
 
+        /*
+         * Note, there's a small window here that the func_hash->filter_hash
+         * may be NULL or empty. Need to be carefule when reading the loop.
+         */
         mutex_lock(&probe->ops.func_hash->regex_lock);
 
         orig_hash = &probe->ops.func_hash->filter_hash;
         old_hash = *orig_hash;
         hash = alloc_and_copy_ftrace_hash(FTRACE_HASH_DEFAULT_BITS, old_hash);
 
+        if (!hash) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
         ret = ftrace_match_records(hash, glob, strlen(glob));
 
         /* Nothing found? */
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 525a97fbbc60..563e80f9006a 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1567,9 +1567,9 @@ update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu,
 
 /**
  * update_max_tr_single - only copy one trace over, and reset the rest
- * @tr - tracer
- * @tsk - task with the latency
- * @cpu - the cpu of the buffer to copy.
+ * @tr: tracer
+ * @tsk: task with the latency
+ * @cpu: the cpu of the buffer to copy.
  *
  * Flip the trace of a single CPU buffer between the @tr and the max_tr.
  */
@@ -1767,7 +1767,7 @@ static void __init apply_trace_boot_options(void);
 
 /**
  * register_tracer - register a tracer with the ftrace system.
- * @type - the plugin for the tracer
+ * @type: the plugin for the tracer
  *
  * Register a new plugin tracer.
  */
@@ -2230,9 +2230,9 @@ static bool tracing_record_taskinfo_skip(int flags)
 /**
  * tracing_record_taskinfo - record the task info of a task
  *
- * @task  - task to record
- * @flags - TRACE_RECORD_CMDLINE for recording comm
- *        - TRACE_RECORD_TGID for recording tgid
+ * @task:  task to record
+ * @flags: TRACE_RECORD_CMDLINE for recording comm
+ *         TRACE_RECORD_TGID for recording tgid
  */
 void tracing_record_taskinfo(struct task_struct *task, int flags)
 {
@@ -2258,10 +2258,10 @@ void tracing_record_taskinfo(struct task_struct *task, int flags)
 /**
  * tracing_record_taskinfo_sched_switch - record task info for sched_switch
  *
- * @prev - previous task during sched_switch
- * @next - next task during sched_switch
- * @flags - TRACE_RECORD_CMDLINE for recording comm
- *          TRACE_RECORD_TGID for recording tgid
+ * @prev: previous task during sched_switch
+ * @next: next task during sched_switch
+ * @flags: TRACE_RECORD_CMDLINE for recording comm
+ *         TRACE_RECORD_TGID for recording tgid
  */
 void tracing_record_taskinfo_sched_switch(struct task_struct *prev,
                                           struct task_struct *next, int flags)
@@ -3072,7 +3072,9 @@ static void trace_printk_start_stop_comm(int enabled)
 
 /**
  * trace_vbprintk - write binary msg to tracing buffer
- *
+ * @ip:    The address of the caller
+ * @fmt:   The string format to write to the buffer
+ * @args:  Arguments for @fmt
  */
 int trace_vbprintk(unsigned long ip, const char *fmt, va_list args)
 {
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index c7506bc81b75..648930823b57 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -787,7 +787,7 @@ static int __ftrace_set_clr_event(struct trace_array *tr, const char *match,
         return ret;
 }
 
-static int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set)
+int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set)
 {
         char *event = NULL, *sub = NULL, *match;
         int ret;
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index dbef0d135075..fb6bfbc5bf86 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -895,7 +895,8 @@ void trace_probe_cleanup(struct trace_probe *tp)
         for (i = 0; i < tp->nr_args; i++)
                 traceprobe_free_probe_arg(&tp->args[i]);
 
-        kfree(call->class->system);
+        if (call->class)
+                kfree(call->class->system);
         kfree(call->name);
         kfree(call->print_fmt);
 }
diff --git a/lib/kfifo.c b/lib/kfifo.c
index 117ad0e7fbf4..70dab9ac7827 100644
--- a/lib/kfifo.c
+++ b/lib/kfifo.c
@@ -68,7 +68,8 @@ int __kfifo_init(struct __kfifo *fifo, void *buffer,
 {
         size /= esize;
 
-        size = roundup_pow_of_two(size);
+        if (!is_power_of_2(size))
+                size = rounddown_pow_of_two(size);
 
         fifo->in = 0;
         fifo->out = 0;
diff --git a/lib/logic_pio.c b/lib/logic_pio.c
index feea48fd1a0d..905027574e5d 100644
--- a/lib/logic_pio.c
+++ b/lib/logic_pio.c
@@ -35,7 +35,7 @@ int logic_pio_register_range(struct logic_pio_hwaddr *new_range)
         struct logic_pio_hwaddr *range;
         resource_size_t start;
         resource_size_t end;
-        resource_size_t mmio_sz = 0;
+        resource_size_t mmio_end = 0;
         resource_size_t iio_sz = MMIO_UPPER_LIMIT;
         int ret = 0;
 
@@ -46,7 +46,7 @@ int logic_pio_register_range(struct logic_pio_hwaddr *new_range)
         end = new_range->hw_start + new_range->size;
 
         mutex_lock(&io_range_mutex);
-        list_for_each_entry_rcu(range, &io_range_list, list) {
+        list_for_each_entry(range, &io_range_list, list) {
                 if (range->fwnode == new_range->fwnode) {
                         /* range already there */
                         goto end_register;
@@ -56,7 +56,7 @@ int logic_pio_register_range(struct logic_pio_hwaddr *new_range)
                         /* for MMIO ranges we need to check for overlap */
                         if (start >= range->hw_start + range->size ||
                             end < range->hw_start) {
-                                mmio_sz += range->size;
+                                mmio_end = range->io_start + range->size;
                         } else {
                                 ret = -EFAULT;
                                 goto end_register;
@@ -69,16 +69,16 @@ int logic_pio_register_range(struct logic_pio_hwaddr *new_range)
 
         /* range not registered yet, check for available space */
         if (new_range->flags == LOGIC_PIO_CPU_MMIO) {
-                if (mmio_sz + new_range->size - 1 > MMIO_UPPER_LIMIT) {
+                if (mmio_end + new_range->size - 1 > MMIO_UPPER_LIMIT) {
                         /* if it's too big check if 64K space can be reserved */
-                        if (mmio_sz + SZ_64K - 1 > MMIO_UPPER_LIMIT) {
+                        if (mmio_end + SZ_64K - 1 > MMIO_UPPER_LIMIT) {
                                 ret = -E2BIG;
                                 goto end_register;
                         }
                         new_range->size = SZ_64K;
                         pr_warn("Requested IO range too big, new size set to 64K\n");
                 }
-                new_range->io_start = mmio_sz;
+                new_range->io_start = mmio_end;
         } else if (new_range->flags == LOGIC_PIO_INDIRECT) {
                 if (iio_sz + new_range->size - 1 > IO_SPACE_LIMIT) {
                         ret = -E2BIG;
@@ -99,6 +99,20 @@ end_register:
 }
 
 /**
+ * logic_pio_unregister_range - unregister a logical PIO range for a host
+ * @range: pointer to the IO range which has been already registered.
+ *
+ * Unregister a previously-registered IO range node.
+ */
+void logic_pio_unregister_range(struct logic_pio_hwaddr *range)
+{
+        mutex_lock(&io_range_mutex);
+        list_del_rcu(&range->list);
+        mutex_unlock(&io_range_mutex);
+        synchronize_rcu();
+}
+
+/**
  * find_io_range_by_fwnode - find logical PIO range for given FW node
  * @fwnode: FW node handle associated with logical PIO range
  *
@@ -108,26 +122,38 @@ end_register:
  */
 struct logic_pio_hwaddr *find_io_range_by_fwnode(struct fwnode_handle *fwnode)
 {
-        struct logic_pio_hwaddr *range;
+        struct logic_pio_hwaddr *range, *found_range = NULL;
 
+        rcu_read_lock();
         list_for_each_entry_rcu(range, &io_range_list, list) {
-                if (range->fwnode == fwnode)
-                        return range;
+                if (range->fwnode == fwnode) {
+                        found_range = range;
+                        break;
+                }
         }
-        return NULL;
+        rcu_read_unlock();
+
+        return found_range;
 }
 
 /* Return a registered range given an input PIO token */
 static struct logic_pio_hwaddr *find_io_range(unsigned long pio)
 {
-        struct logic_pio_hwaddr *range;
+        struct logic_pio_hwaddr *range, *found_range = NULL;
 
+        rcu_read_lock();
         list_for_each_entry_rcu(range, &io_range_list, list) {
-                if (in_range(pio, range->io_start, range->size))
-                        return range;
+                if (in_range(pio, range->io_start, range->size)) {
+                        found_range = range;
+                        break;
+                }
         }
-        pr_err("PIO entry token %lx invalid\n", pio);
-        return NULL;
+        rcu_read_unlock();
+
+        if (!found_range)
+                pr_err("PIO entry token 0x%lx invalid\n", pio);
+
+        return found_range;
 }
 
 /**
@@ -180,14 +206,23 @@ unsigned long logic_pio_trans_cpuaddr(resource_size_t addr)
 {
         struct logic_pio_hwaddr *range;
 
+        rcu_read_lock();
         list_for_each_entry_rcu(range, &io_range_list, list) {
                 if (range->flags != LOGIC_PIO_CPU_MMIO)
                         continue;
-                if (in_range(addr, range->hw_start, range->size))
-                        return addr - range->hw_start + range->io_start;
+                if (in_range(addr, range->hw_start, range->size)) {
+                        unsigned long cpuaddr;
+
+                        cpuaddr = addr - range->hw_start + range->io_start;
+
+                        rcu_read_unlock();
+                        return cpuaddr;
+                }
         }
-        pr_err("addr %llx not registered in io_range_list\n",
-               (unsigned long long) addr);
+        rcu_read_unlock();
+
+        pr_err("addr %pa not registered in io_range_list\n", &addr);
+
         return ~0UL;
 }
 
diff --git a/mm/balloon_compaction.c b/mm/balloon_compaction.c
index 798275a51887..26de020aae7b 100644
--- a/mm/balloon_compaction.c
+++ b/mm/balloon_compaction.c
@@ -124,7 +124,8 @@ EXPORT_SYMBOL_GPL(balloon_page_list_dequeue);
 struct page *balloon_page_alloc(void)
 {
         struct page *page = alloc_page(balloon_mapping_gfp_mask() |
-                                       __GFP_NOMEMALLOC | __GFP_NORETRY);
+                                       __GFP_NOMEMALLOC | __GFP_NORETRY |
+                                       __GFP_NOWARN);
         return page;
 }
 EXPORT_SYMBOL_GPL(balloon_page_alloc);
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 738065f765ab..de1f15969e27 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -32,6 +32,7 @@
 #include <linux/shmem_fs.h>
 #include <linux/oom.h>
 #include <linux/numa.h>
+#include <linux/page_owner.h>
 
 #include <asm/tlb.h>
 #include <asm/pgalloc.h>
@@ -2516,6 +2517,9 @@ static void __split_huge_page(struct page *page, struct list_head *list,
         }
 
         ClearPageCompound(head);
+
+        split_page_owner(head, HPAGE_PMD_ORDER);
+
         /* See comment in __split_huge_page_tail() */
         if (PageAnon(head)) {
                 /* Additional pin to swap cache */
diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index 2277b82902d8..95d16a42db6b 100644
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -407,8 +407,14 @@ static inline bool shadow_invalid(u8 tag, s8 shadow_byte)
         if (IS_ENABLED(CONFIG_KASAN_GENERIC))
                 return shadow_byte < 0 ||
                         shadow_byte >= KASAN_SHADOW_SCALE_SIZE;
-        else
-                return tag != (u8)shadow_byte;
+
+        /* else CONFIG_KASAN_SW_TAGS: */
+        if ((u8)shadow_byte == KASAN_TAG_INVALID)
+                return true;
+        if ((tag != KASAN_TAG_KERNEL) && (tag != (u8)shadow_byte))
+                return true;
+
+        return false;
 }
 
 static bool __kasan_slab_free(struct kmem_cache *cache, void *object,
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 6f5c0c517c49..9ec5e12486a7 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -752,15 +752,13 @@ void __mod_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx,
         /* Update memcg */
         __mod_memcg_state(memcg, idx, val);
 
+        /* Update lruvec */
+        __this_cpu_add(pn->lruvec_stat_local->count[idx], val);
+
         x = val + __this_cpu_read(pn->lruvec_stat_cpu->count[idx]);
         if (unlikely(abs(x) > MEMCG_CHARGE_BATCH)) {
                 struct mem_cgroup_per_node *pi;
 
-                /*
-                 * Batch local counters to keep them in sync with
-                 * the hierarchical ones.
-                 */
-                __this_cpu_add(pn->lruvec_stat_local->count[idx], x);
                 for (pi = pn; pi; pi = parent_nodeinfo(pi, pgdat->node_id))
                         atomic_long_add(x, &pi->lruvec_stat[idx]);
                 x = 0;
@@ -3260,6 +3258,72 @@ static u64 mem_cgroup_read_u64(struct cgroup_subsys_state *css,
         }
 }
 
+static void memcg_flush_percpu_vmstats(struct mem_cgroup *memcg, bool slab_only)
+{
+        unsigned long stat[MEMCG_NR_STAT];
+        struct mem_cgroup *mi;
+        int node, cpu, i;
+        int min_idx, max_idx;
+
+        if (slab_only) {
+                min_idx = NR_SLAB_RECLAIMABLE;
+                max_idx = NR_SLAB_UNRECLAIMABLE;
+        } else {
+                min_idx = 0;
+                max_idx = MEMCG_NR_STAT;
+        }
+
+        for (i = min_idx; i < max_idx; i++)
+                stat[i] = 0;
+
+        for_each_online_cpu(cpu)
+                for (i = min_idx; i < max_idx; i++)
+                        stat[i] += per_cpu(memcg->vmstats_percpu->stat[i], cpu);
+
+        for (mi = memcg; mi; mi = parent_mem_cgroup(mi))
+                for (i = min_idx; i < max_idx; i++)
+                        atomic_long_add(stat[i], &mi->vmstats[i]);
+
+        if (!slab_only)
+                max_idx = NR_VM_NODE_STAT_ITEMS;
+
+        for_each_node(node) {
+                struct mem_cgroup_per_node *pn = memcg->nodeinfo[node];
+                struct mem_cgroup_per_node *pi;
+
+                for (i = min_idx; i < max_idx; i++)
+                        stat[i] = 0;
+
+                for_each_online_cpu(cpu)
+                        for (i = min_idx; i < max_idx; i++)
+                                stat[i] += per_cpu(
+                                        pn->lruvec_stat_cpu->count[i], cpu);
+
+                for (pi = pn; pi; pi = parent_nodeinfo(pi, node))
+                        for (i = min_idx; i < max_idx; i++)
+                                atomic_long_add(stat[i], &pi->lruvec_stat[i]);
+        }
+}
+
+static void memcg_flush_percpu_vmevents(struct mem_cgroup *memcg)
+{
+        unsigned long events[NR_VM_EVENT_ITEMS];
+        struct mem_cgroup *mi;
+        int cpu, i;
+
+        for (i = 0; i < NR_VM_EVENT_ITEMS; i++)
+                events[i] = 0;
+
+        for_each_online_cpu(cpu)
+                for (i = 0; i < NR_VM_EVENT_ITEMS; i++)
+                        events[i] += per_cpu(memcg->vmstats_percpu->events[i],
+                                             cpu);
+
+        for (mi = memcg; mi; mi = parent_mem_cgroup(mi))
+                for (i = 0; i < NR_VM_EVENT_ITEMS; i++)
+                        atomic_long_add(events[i], &mi->vmevents[i]);
+}
+
 #ifdef CONFIG_MEMCG_KMEM
 static int memcg_online_kmem(struct mem_cgroup *memcg)
 {
@@ -3309,7 +3373,14 @@ static void memcg_offline_kmem(struct mem_cgroup *memcg)
         if (!parent)
                 parent = root_mem_cgroup;
 
+        /*
+         * Deactivate and reparent kmem_caches. Then flush percpu
+         * slab statistics to have precise values at the parent and
+         * all ancestor levels. It's required to keep slab stats
+         * accurate after the reparenting of kmem_caches.
+         */
         memcg_deactivate_kmem_caches(memcg, parent);
+        memcg_flush_percpu_vmstats(memcg, true);
 
         kmemcg_id = memcg->kmemcg_id;
         BUG_ON(kmemcg_id < 0);
@@ -4682,6 +4753,12 @@ static void __mem_cgroup_free(struct mem_cgroup *memcg)
 {
         int node;
 
+        /*
+         * Flush percpu vmstats and vmevents to guarantee the value correctness
+         * on parent's and all ancestor levels.
+         */
+        memcg_flush_percpu_vmstats(memcg, false);
+        memcg_flush_percpu_vmevents(memcg);
         for_each_node(node)
                 free_mem_cgroup_per_node_info(memcg, node);
         free_percpu(memcg->vmstats_percpu);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 272c6de1bf4e..9c9194959271 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2238,27 +2238,12 @@ static int move_freepages(struct zone *zone,
         unsigned int order;
         int pages_moved = 0;
 
-#ifndef CONFIG_HOLES_IN_ZONE
-        /*
-         * page_zone is not safe to call in this context when
-         * CONFIG_HOLES_IN_ZONE is set. This bug check is probably redundant
-         * anyway as we check zone boundaries in move_freepages_block().
-         * Remove at a later date when no bug reports exist related to
-         * grouping pages by mobility
-         */
-        VM_BUG_ON(pfn_valid(page_to_pfn(start_page)) &&
-                  pfn_valid(page_to_pfn(end_page)) &&
-                  page_zone(start_page) != page_zone(end_page));
-#endif
         for (page = start_page; page <= end_page;) {
                 if (!pfn_valid_within(page_to_pfn(page))) {
                         page++;
                         continue;
                 }
 
-                /* Make sure we are not inadvertently changing nodes */
-                VM_BUG_ON_PAGE(page_to_nid(page) != zone_to_nid(zone), page);
-
                 if (!PageBuddy(page)) {
                         /*
                          * We assume that pages that could be isolated for
@@ -2273,6 +2258,10 @@ static int move_freepages(struct zone *zone,
                         continue;
                 }
 
+                /* Make sure we are not inadvertently changing nodes */
+                VM_BUG_ON_PAGE(page_to_nid(page) != zone_to_nid(zone), page);
+                VM_BUG_ON_PAGE(page_zone(page) != zone, page);
+
                 order = page_order(page);
                 move_to_free_area(page, &zone->free_area[order], migratetype);
                 page += 1 << order;
diff --git a/mm/vmscan.c b/mm/vmscan.c
index c77d1e3761a7..a6c5d0b28321 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -3220,6 +3220,7 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
 
 #ifdef CONFIG_MEMCG
 
+/* Only used by soft limit reclaim. Do not reuse for anything else. */
 unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg,
                                                 gfp_t gfp_mask, bool noswap,
                                                 pg_data_t *pgdat,
@@ -3235,7 +3236,8 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg,
         };
         unsigned long lru_pages;
 
-        set_task_reclaim_state(current, &sc.reclaim_state);
+        WARN_ON_ONCE(!current->reclaim_state);
+
         sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) |
                         (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK);
 
@@ -3253,7 +3255,6 @@ unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg,
 
         trace_mm_vmscan_memcg_softlimit_reclaim_end(sc.nr_reclaimed);
 
-        set_task_reclaim_state(current, NULL);
         *nr_scanned = sc.nr_scanned;
 
         return sc.nr_reclaimed;
diff --git a/mm/z3fold.c b/mm/z3fold.c
index ed19d98c9dcd..75b7962439ff 100644
--- a/mm/z3fold.c
+++ b/mm/z3fold.c
@@ -41,6 +41,7 @@
 #include <linux/workqueue.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
+#include <linux/wait.h>
 #include <linux/zpool.h>
 #include <linux/magic.h>
 
@@ -145,6 +146,8 @@ struct z3fold_header {
  * @release_wq: workqueue for safe page release
  * @work:       work_struct for safe page release
  * @inode:      inode for z3fold pseudo filesystem
+ * @destroying: bool to stop migration once we start destruction
+ * @isolated: int to count the number of pages currently in isolation
  *
  * This structure is allocated at pool creation time and maintains metadata
  * pertaining to a particular z3fold pool.
@@ -163,8 +166,11 @@ struct z3fold_pool {
         const struct zpool_ops *zpool_ops;
         struct workqueue_struct *compact_wq;
         struct workqueue_struct *release_wq;
+        struct wait_queue_head isolate_wait;
         struct work_struct work;
         struct inode *inode;
+        bool destroying;
+        int isolated;
 };
 
 /*
@@ -769,6 +775,7 @@ static struct z3fold_pool *z3fold_create_pool(const char *name, gfp_t gfp,
                 goto out_c;
         spin_lock_init(&pool->lock);
         spin_lock_init(&pool->stale_lock);
+        init_waitqueue_head(&pool->isolate_wait);
         pool->unbuddied = __alloc_percpu(sizeof(struct list_head)*NCHUNKS, 2);
         if (!pool->unbuddied)
                 goto out_pool;
@@ -808,6 +815,15 @@ out:
         return NULL;
 }
 
+static bool pool_isolated_are_drained(struct z3fold_pool *pool)
+{
+        bool ret;
+
+        spin_lock(&pool->lock);
+        ret = pool->isolated == 0;
+        spin_unlock(&pool->lock);
+        return ret;
+}
 /**
  * z3fold_destroy_pool() - destroys an existing z3fold pool
  * @pool:       the z3fold pool to be destroyed
@@ -817,6 +833,22 @@ out:
 static void z3fold_destroy_pool(struct z3fold_pool *pool)
 {
         kmem_cache_destroy(pool->c_handle);
+        /*
+         * We set pool-> destroying under lock to ensure that
+         * z3fold_page_isolate() sees any changes to destroying. This way we
+         * avoid the need for any memory barriers.
+         */
+
+        spin_lock(&pool->lock);
+        pool->destroying = true;
+        spin_unlock(&pool->lock);
+
+        /*
+         * We need to ensure that no pages are being migrated while we destroy
+         * these workqueues, as migration can queue work on either of the
+         * workqueues.
+         */
+        wait_event(pool->isolate_wait, !pool_isolated_are_drained(pool));
 
         /*
          * We need to destroy pool->compact_wq before pool->release_wq,
@@ -1307,6 +1339,28 @@ static u64 z3fold_get_pool_size(struct z3fold_pool *pool)
         return atomic64_read(&pool->pages_nr);
 }
 
+/*
+ * z3fold_dec_isolated() expects to be called while pool->lock is held.
+ */
+static void z3fold_dec_isolated(struct z3fold_pool *pool)
+{
+        assert_spin_locked(&pool->lock);
+        VM_BUG_ON(pool->isolated <= 0);
+        pool->isolated--;
+
+        /*
+         * If we have no more isolated pages, we have to see if
+         * z3fold_destroy_pool() is waiting for a signal.
+         */
+        if (pool->isolated == 0 && waitqueue_active(&pool->isolate_wait))
+                wake_up_all(&pool->isolate_wait);
+}
+
+static void z3fold_inc_isolated(struct z3fold_pool *pool)
+{
+        pool->isolated++;
+}
+
 static bool z3fold_page_isolate(struct page *page, isolate_mode_t mode)
 {
         struct z3fold_header *zhdr;
@@ -1333,6 +1387,34 @@ static bool z3fold_page_isolate(struct page *page, isolate_mode_t mode)
                 spin_lock(&pool->lock);
                 if (!list_empty(&page->lru))
                         list_del(&page->lru);
+                /*
+                 * We need to check for destruction while holding pool->lock, as
+                 * otherwise destruction could see 0 isolated pages, and
+                 * proceed.
+                 */
+                if (unlikely(pool->destroying)) {
+                        spin_unlock(&pool->lock);
+                        /*
+                         * If this page isn't stale, somebody else holds a
+                         * reference to it. Let't drop our refcount so that they
+                         * can call the release logic.
+                         */
+                        if (unlikely(kref_put(&zhdr->refcount,
+                                              release_z3fold_page_locked))) {
+                                /*
+                                 * If we get here we have kref problems, so we
+                                 * should freak out.
+                                 */
+                                WARN(1, "Z3fold is experiencing kref problems\n");
+                                z3fold_page_unlock(zhdr);
+                                return false;
+                        }
+                        z3fold_page_unlock(zhdr);
+                        return false;
+                }
+
+
+                z3fold_inc_isolated(pool);
                 spin_unlock(&pool->lock);
                 z3fold_page_unlock(zhdr);
                 return true;
@@ -1401,6 +1483,10 @@ static int z3fold_page_migrate(struct address_space *mapping, struct page *newpa
 
         queue_work_on(new_zhdr->cpu, pool->compact_wq, &new_zhdr->work);
 
+        spin_lock(&pool->lock);
+        z3fold_dec_isolated(pool);
+        spin_unlock(&pool->lock);
+
         page_mapcount_reset(page);
         put_page(page);
         return 0;
@@ -1420,10 +1506,14 @@ static void z3fold_page_putback(struct page *page)
         INIT_LIST_HEAD(&page->lru);
         if (kref_put(&zhdr->refcount, release_z3fold_page_locked)) {
                 atomic64_dec(&pool->pages_nr);
+                spin_lock(&pool->lock);
+                z3fold_dec_isolated(pool);
+                spin_unlock(&pool->lock);
                 return;
         }
         spin_lock(&pool->lock);
         list_add(&page->lru, &pool->lru);
+        z3fold_dec_isolated(pool);
         spin_unlock(&pool->lock);
         z3fold_page_unlock(zhdr);
 }
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 57fbb7ced69f..e98bb6ab4f7e 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -54,6 +54,7 @@
 #include <linux/mount.h>
 #include <linux/pseudo_fs.h>
 #include <linux/migrate.h>
+#include <linux/wait.h>
 #include <linux/pagemap.h>
 #include <linux/fs.h>
 
@@ -268,6 +269,10 @@ struct zs_pool {
 #ifdef CONFIG_COMPACTION
         struct inode *inode;
         struct work_struct free_work;
+        /* A wait queue for when migration races with async_free_zspage() */
+        struct wait_queue_head migration_wait;
+        atomic_long_t isolated_pages;
+        bool destroying;
 #endif
 };
 
@@ -1862,6 +1867,31 @@ static void dec_zspage_isolation(struct zspage *zspage)
         zspage->isolated--;
 }
 
+static void putback_zspage_deferred(struct zs_pool *pool,
+                                    struct size_class *class,
+                                    struct zspage *zspage)
+{
+        enum fullness_group fg;
+
+        fg = putback_zspage(class, zspage);
+        if (fg == ZS_EMPTY)
+                schedule_work(&pool->free_work);
+
+}
+
+static inline void zs_pool_dec_isolated(struct zs_pool *pool)
+{
+        VM_BUG_ON(atomic_long_read(&pool->isolated_pages) <= 0);
+        atomic_long_dec(&pool->isolated_pages);
+        /*
+         * There's no possibility of racing, since wait_for_isolated_drain()
+         * checks the isolated count under &class->lock after enqueuing
+         * on migration_wait.
+         */
+        if (atomic_long_read(&pool->isolated_pages) == 0 && pool->destroying)
+                wake_up_all(&pool->migration_wait);
+}
+
 static void replace_sub_page(struct size_class *class, struct zspage *zspage,
                                 struct page *newpage, struct page *oldpage)
 {
@@ -1931,6 +1961,7 @@ static bool zs_page_isolate(struct page *page, isolate_mode_t mode)
          */
         if (!list_empty(&zspage->list) && !is_zspage_isolated(zspage)) {
                 get_zspage_mapping(zspage, &class_idx, &fullness);
+                atomic_long_inc(&pool->isolated_pages);
                 remove_zspage(class, zspage, fullness);
         }
 
@@ -2030,8 +2061,16 @@ static int zs_page_migrate(struct address_space *mapping, struct page *newpage,
          * Page migration is done so let's putback isolated zspage to
          * the list if @page is final isolated subpage in the zspage.
          */
-        if (!is_zspage_isolated(zspage))
-                putback_zspage(class, zspage);
+        if (!is_zspage_isolated(zspage)) {
+                /*
+                 * We cannot race with zs_destroy_pool() here because we wait
+                 * for isolation to hit zero before we start destroying.
+                 * Also, we ensure that everyone can see pool->destroying before
+                 * we start waiting.
+                 */
+                putback_zspage_deferred(pool, class, zspage);
+                zs_pool_dec_isolated(pool);
+        }
 
         reset_page(page);
         put_page(page);
@@ -2077,13 +2116,12 @@ static void zs_page_putback(struct page *page)
         spin_lock(&class->lock);
         dec_zspage_isolation(zspage);
         if (!is_zspage_isolated(zspage)) {
-                fg = putback_zspage(class, zspage);
                 /*
                  * Due to page_lock, we cannot free zspage immediately
                  * so let's defer.
                  */
-                if (fg == ZS_EMPTY)
-                        schedule_work(&pool->free_work);
+                putback_zspage_deferred(pool, class, zspage);
+                zs_pool_dec_isolated(pool);
         }
         spin_unlock(&class->lock);
 }
@@ -2107,8 +2145,36 @@ static int zs_register_migration(struct zs_pool *pool)
         return 0;
 }
 
+static bool pool_isolated_are_drained(struct zs_pool *pool)
+{
+        return atomic_long_read(&pool->isolated_pages) == 0;
+}
+
+/* Function for resolving migration */
+static void wait_for_isolated_drain(struct zs_pool *pool)
+{
+
+        /*
+         * We're in the process of destroying the pool, so there are no
+         * active allocations. zs_page_isolate() fails for completely free
+         * zspages, so we need only wait for the zs_pool's isolated
+         * count to hit zero.
+         */
+        wait_event(pool->migration_wait,
+                   pool_isolated_are_drained(pool));
+}
+
 static void zs_unregister_migration(struct zs_pool *pool)
 {
+        pool->destroying = true;
+        /*
+         * We need a memory barrier here to ensure global visibility of
+         * pool->destroying. Thus pool->isolated pages will either be 0 in which
+         * case we don't care, or it will be > 0 and pool->destroying will
+         * ensure that we wake up once isolation hits 0.
+         */
+        smp_mb();
+        wait_for_isolated_drain(pool); /* This can block */
         flush_work(&pool->free_work);
         iput(pool->inode);
 }
@@ -2346,6 +2412,10 @@ struct zs_pool *zs_create_pool(const char *name)
         if (!pool->name)
                 goto err;
 
+#ifdef CONFIG_COMPACTION
+        init_waitqueue_head(&pool->migration_wait);
+#endif
+
         if (create_cache(pool))
                 goto err;
 
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 240ed70912d6..d78938e3e008 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -277,17 +277,23 @@ static u8 batadv_hop_penalty(u8 tq, const struct batadv_priv *bat_priv)
  * batadv_iv_ogm_aggr_packet() - checks if there is another OGM attached
  * @buff_pos: current position in the skb
  * @packet_len: total length of the skb
- * @tvlv_len: tvlv length of the previously considered OGM
+ * @ogm_packet: potential OGM in buffer
  *
  * Return: true if there is enough space for another OGM, false otherwise.
  */
-static bool batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len,
-                                      __be16 tvlv_len)
+static bool
+batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len,
+                          const struct batadv_ogm_packet *ogm_packet)
 {
         int next_buff_pos = 0;
 
-        next_buff_pos += buff_pos + BATADV_OGM_HLEN;
-        next_buff_pos += ntohs(tvlv_len);
+        /* check if there is enough space for the header */
+        next_buff_pos += buff_pos + sizeof(*ogm_packet);
+        if (next_buff_pos > packet_len)
+                return false;
+
+        /* check if there is enough space for the optional TVLV */
+        next_buff_pos += ntohs(ogm_packet->tvlv_len);
 
         return (next_buff_pos <= packet_len) &&
                (next_buff_pos <= BATADV_MAX_AGGREGATION_BYTES);
@@ -315,7 +321,7 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet,
 
         /* adjust all flags and log packets */
         while (batadv_iv_ogm_aggr_packet(buff_pos, forw_packet->packet_len,
-                                         batadv_ogm_packet->tvlv_len)) {
+                                         batadv_ogm_packet)) {
                 /* we might have aggregated direct link packets with an
                  * ordinary base packet
                  */
@@ -1704,7 +1710,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb,
 
         /* unpack the aggregated packets and process them one by one */
         while (batadv_iv_ogm_aggr_packet(ogm_offset, skb_headlen(skb),
-                                         ogm_packet->tvlv_len)) {
+                                         ogm_packet)) {
                 batadv_iv_ogm_process(skb, ogm_offset, if_incoming);
 
                 ogm_offset += BATADV_OGM_HLEN;
diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c
index fad95ef64e01..bc06e3cdfa84 100644
--- a/net/batman-adv/bat_v_ogm.c
+++ b/net/batman-adv/bat_v_ogm.c
@@ -631,17 +631,23 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv,
  * batadv_v_ogm_aggr_packet() - checks if there is another OGM aggregated
  * @buff_pos: current position in the skb
  * @packet_len: total length of the skb
- * @tvlv_len: tvlv length of the previously considered OGM
+ * @ogm2_packet: potential OGM2 in buffer
  *
  * Return: true if there is enough space for another OGM, false otherwise.
  */
-static bool batadv_v_ogm_aggr_packet(int buff_pos, int packet_len,
-                                     __be16 tvlv_len)
+static bool
+batadv_v_ogm_aggr_packet(int buff_pos, int packet_len,
+                         const struct batadv_ogm2_packet *ogm2_packet)
 {
         int next_buff_pos = 0;
 
-        next_buff_pos += buff_pos + BATADV_OGM2_HLEN;
-        next_buff_pos += ntohs(tvlv_len);
+        /* check if there is enough space for the header */
+        next_buff_pos += buff_pos + sizeof(*ogm2_packet);
+        if (next_buff_pos > packet_len)
+                return false;
+
+        /* check if there is enough space for the optional TVLV */
+        next_buff_pos += ntohs(ogm2_packet->tvlv_len);
 
         return (next_buff_pos <= packet_len) &&
                (next_buff_pos <= BATADV_MAX_AGGREGATION_BYTES);
@@ -818,7 +824,7 @@ int batadv_v_ogm_packet_recv(struct sk_buff *skb,
         ogm_packet = (struct batadv_ogm2_packet *)skb->data;
 
         while (batadv_v_ogm_aggr_packet(ogm_offset, skb_headlen(skb),
-                                        ogm_packet->tvlv_len)) {
+                                        ogm_packet)) {
                 batadv_v_ogm_process(skb, ogm_offset, if_incoming);
 
                 ogm_offset += BATADV_OGM2_HLEN;
diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
index 67d7f83009ae..1d5bdf3a4b65 100644
--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
@@ -2303,7 +2303,7 @@ __batadv_mcast_flags_dump(struct sk_buff *msg, u32 portid,
 
         while (bucket_tmp < hash->size) {
                 if (batadv_mcast_flags_dump_bucket(msg, portid, cb, hash,
-                                                   *bucket, &idx_tmp))
+                                                   bucket_tmp, &idx_tmp))
                         break;
 
                 bucket_tmp++;
@@ -2420,8 +2420,10 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig)
         batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS);
         batadv_mcast_want_ipv4_update(bat_priv, orig, BATADV_NO_FLAGS);
         batadv_mcast_want_ipv6_update(bat_priv, orig, BATADV_NO_FLAGS);
-        batadv_mcast_want_rtr4_update(bat_priv, orig, BATADV_NO_FLAGS);
-        batadv_mcast_want_rtr6_update(bat_priv, orig, BATADV_NO_FLAGS);
+        batadv_mcast_want_rtr4_update(bat_priv, orig,
+                                      BATADV_MCAST_WANT_NO_RTR4);
+        batadv_mcast_want_rtr6_update(bat_priv, orig,
+                                      BATADV_MCAST_WANT_NO_RTR6);
 
         spin_unlock_bh(&orig->mcast_handler_lock);
 }
diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index 6f08fd122a8d..7e052d6f759b 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -164,7 +164,7 @@ batadv_netlink_get_ifindex(const struct nlmsghdr *nlh, int attrtype)
 {
         struct nlattr *attr = nlmsg_find_attr(nlh, GENL_HDRLEN, attrtype);
 
-        return attr ? nla_get_u32(attr) : 0;
+        return (attr && nla_len(attr) == sizeof(u32)) ? nla_get_u32(attr) : 0;
 }
 
 /**
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index b9585e7d9d2e..04bc79359a17 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3202,6 +3202,7 @@ struct hci_dev *hci_alloc_dev(void)
         hdev->conn_info_min_age = DEFAULT_CONN_INFO_MIN_AGE;
         hdev->conn_info_max_age = DEFAULT_CONN_INFO_MAX_AGE;
         hdev->auth_payload_timeout = DEFAULT_AUTH_PAYLOAD_TIMEOUT;
+        hdev->min_enc_key_size = HCI_MIN_ENC_KEY_SIZE;
 
         mutex_init(&hdev->lock);
         mutex_init(&hdev->req_lock);
diff --git a/net/bluetooth/hci_debugfs.c b/net/bluetooth/hci_debugfs.c
index bb67f4a5479a..402e2cc54044 100644
--- a/net/bluetooth/hci_debugfs.c
+++ b/net/bluetooth/hci_debugfs.c
@@ -433,6 +433,35 @@ static int auto_accept_delay_set(void *data, u64 val)
         return 0;
 }
 
+static int min_encrypt_key_size_set(void *data, u64 val)
+{
+        struct hci_dev *hdev = data;
+
+        if (val < 1 || val > 16)
+                return -EINVAL;
+
+        hci_dev_lock(hdev);
+        hdev->min_enc_key_size = val;
+        hci_dev_unlock(hdev);
+
+        return 0;
+}
+
+static int min_encrypt_key_size_get(void *data, u64 *val)
+{
+        struct hci_dev *hdev = data;
+
+        hci_dev_lock(hdev);
+        *val = hdev->min_enc_key_size;
+        hci_dev_unlock(hdev);
+
+        return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(min_encrypt_key_size_fops,
+                        min_encrypt_key_size_get,
+                        min_encrypt_key_size_set, "%llu\n");
+
 static int auto_accept_delay_get(void *data, u64 *val)
 {
         struct hci_dev *hdev = data;
@@ -545,6 +574,8 @@ void hci_debugfs_create_bredr(struct hci_dev *hdev)
         if (lmp_ssp_capable(hdev)) {
                 debugfs_create_file("ssp_debug_mode", 0444, hdev->debugfs,
                                     hdev, &ssp_debug_mode_fops);
+                debugfs_create_file("min_encrypt_key_size", 0644, hdev->debugfs,
+                                    hdev, &min_encrypt_key_size_fops);
                 debugfs_create_file("auto_accept_delay", 0644, hdev->debugfs,
                                     hdev, &auto_accept_delay_fops);
         }
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 5abd423b55fa..8d889969ae7e 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -101,6 +101,7 @@ static int hidp_send_message(struct hidp_session *session, struct socket *sock,
 {
         struct sk_buff *skb;
         struct sock *sk = sock->sk;
+        int ret;
 
         BT_DBG("session %p data %p size %d", session, data, size);
 
@@ -114,13 +115,17 @@ static int hidp_send_message(struct hidp_session *session, struct socket *sock,
         }
 
         skb_put_u8(skb, hdr);
-        if (data && size > 0)
+        if (data && size > 0) {
                 skb_put_data(skb, data, size);
+                ret = size;
+        } else {
+                ret = 0;
+        }
 
         skb_queue_tail(transmit, skb);
         wake_up_interruptible(sk_sleep(sk));
 
-        return 0;
+        return ret;
 }
 
 static int hidp_send_ctrl_message(struct hidp_session *session,
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index cc506fe99b4d..dfc1edb168b7 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1361,7 +1361,7 @@ static bool l2cap_check_enc_key_size(struct hci_conn *hcon)
          * actually encrypted before enforcing a key size.
          */
         return (!test_bit(HCI_CONN_ENCRYPT, &hcon->flags) ||
-                hcon->enc_key_size >= HCI_MIN_ENC_KEY_SIZE);
+                hcon->enc_key_size >= hcon->hdev->min_enc_key_size);
 }
 
 static void l2cap_do_start(struct l2cap_chan *chan)
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index c8177a89f52c..4096d8a74a2b 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -221,7 +221,7 @@ unsigned int ebt_do_table(struct sk_buff *skb,
                         return NF_DROP;
                 }
 
-                ADD_COUNTER(*(counter_base + i), 1, skb->len);
+                ADD_COUNTER(*(counter_base + i), skb->len, 1);
 
                 /* these should only watch: not modify, nor tell us
                  * what to do with the packet
@@ -959,8 +959,8 @@ static void get_counters(const struct ebt_counter *oldcounters,
                         continue;
                 counter_base = COUNTER_BASE(oldcounters, nentries, cpu);
                 for (i = 0; i < nentries; i++)
-                        ADD_COUNTER(counters[i], counter_base[i].pcnt,
-                                    counter_base[i].bcnt);
+                        ADD_COUNTER(counters[i], counter_base[i].bcnt,
+                                    counter_base[i].pcnt);
         }
 }
 
@@ -1280,7 +1280,7 @@ static int do_update_counters(struct net *net, const char *name,
 
         /* we add to the counters of the first cpu */
         for (i = 0; i < num_counters; i++)
-                ADD_COUNTER(t->private->counters[i], tmp[i].pcnt, tmp[i].bcnt);
+                ADD_COUNTER(t->private->counters[i], tmp[i].bcnt, tmp[i].pcnt);
 
         write_unlock_bh(&t->lock);
         ret = 0;
diff --git a/net/bridge/netfilter/nft_meta_bridge.c b/net/bridge/netfilter/nft_meta_bridge.c
index 1804e867f715..7c9e92b2f806 100644
--- a/net/bridge/netfilter/nft_meta_bridge.c
+++ b/net/bridge/netfilter/nft_meta_bridge.c
@@ -53,7 +53,7 @@ static void nft_meta_bridge_get_eval(const struct nft_expr *expr,
                         goto err;
 
                 br_vlan_get_proto(br_dev, &p_proto);
-                nft_reg_store16(dest, p_proto);
+                nft_reg_store16(dest, htons(p_proto));
                 return;
         }
         default:
diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c
index 5d6724cee38f..4f75df40fb12 100644
--- a/net/ceph/crypto.c
+++ b/net/ceph/crypto.c
@@ -136,8 +136,10 @@ void ceph_crypto_key_destroy(struct ceph_crypto_key *key)
         if (key) {
                 kfree(key->key);
                 key->key = NULL;
-                crypto_free_sync_skcipher(key->tfm);
-                key->tfm = NULL;
+                if (key->tfm) {
+                        crypto_free_sync_skcipher(key->tfm);
+                        key->tfm = NULL;
+                }
         }
 }
 
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 0b2df09b2554..78ae6e8c953d 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1496,7 +1496,7 @@ static enum calc_target_result calc_target(struct ceph_osd_client *osdc,
         struct ceph_osds up, acting;
         bool force_resend = false;
         bool unpaused = false;
-        bool legacy_change;
+        bool legacy_change = false;
         bool split = false;
         bool sort_bitwise = ceph_osdmap_flag(osdc, CEPH_OSDMAP_SORTBITWISE);
         bool recovery_deletes = ceph_osdmap_flag(osdc,
@@ -1584,15 +1584,14 @@ static enum calc_target_result calc_target(struct ceph_osd_client *osdc,
                 t->osd = acting.primary;
         }
 
-        if (unpaused || legacy_change || force_resend ||
-            (split && con && CEPH_HAVE_FEATURE(con->peer_features,
-                                               RESEND_ON_SPLIT)))
+        if (unpaused || legacy_change || force_resend || split)
                 ct_res = CALC_TARGET_NEED_RESEND;
         else
                 ct_res = CALC_TARGET_NO_ACTION;
 
 out:
-        dout("%s t %p -> ct_res %d osd %d\n", __func__, t, ct_res, t->osd);
+        dout("%s t %p -> %d%d%d%d ct_res %d osd%d\n", __func__, t, unpaused,
+             legacy_change, force_resend, split, ct_res, t->osd);
         return ct_res;
 }
 
diff --git a/net/core/filter.c b/net/core/filter.c
index 7878f918b8c0..4c6a252d4212 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -8757,13 +8757,13 @@ sk_reuseport_is_valid_access(int off, int size,
                 return size == size_default;
 
         /* Fields that allow narrowing */
-        case offsetof(struct sk_reuseport_md, eth_protocol):
+        case bpf_ctx_range(struct sk_reuseport_md, eth_protocol):
                 if (size < FIELD_SIZEOF(struct sk_buff, protocol))
                         return false;
                 /* fall through */
-        case offsetof(struct sk_reuseport_md, ip_protocol):
-        case offsetof(struct sk_reuseport_md, bind_inany):
-        case offsetof(struct sk_reuseport_md, len):
+        case bpf_ctx_range(struct sk_reuseport_md, ip_protocol):
+        case bpf_ctx_range(struct sk_reuseport_md, bind_inany):
+        case bpf_ctx_range(struct sk_reuseport_md, len):
                 bpf_ctx_record_field_size(info, size_default);
                 return bpf_ctx_narrow_access_ok(off, size, size_default);
 
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 3e6fedb57bc1..2470b4b404e6 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -142,8 +142,8 @@ int skb_flow_dissector_bpf_prog_detach(const union bpf_attr *attr)
                 mutex_unlock(&flow_dissector_mutex);
                 return -ENOENT;
         }
-        bpf_prog_put(attached);
         RCU_INIT_POINTER(net->flow_dissector_prog, NULL);
+        bpf_prog_put(attached);
         mutex_unlock(&flow_dissector_mutex);
         return 0;
 }
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 2cf27da1baeb..849380a622ef 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -122,7 +122,7 @@ static void queue_process(struct work_struct *work)
                 txq = netdev_get_tx_queue(dev, q_index);
                 HARD_TX_LOCK(dev, txq, smp_processor_id());
                 if (netif_xmit_frozen_or_stopped(txq) ||
-                    netpoll_start_xmit(skb, dev, txq) != NETDEV_TX_OK) {
+                    !dev_xmit_complete(netpoll_start_xmit(skb, dev, txq))) {
                         skb_queue_head(&npinfo->txq, skb);
                         HARD_TX_UNLOCK(dev, txq);
                         local_irq_restore(flags);
@@ -335,7 +335,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
 
                                 HARD_TX_UNLOCK(dev, txq);
 
-                                if (status == NETDEV_TX_OK)
+                                if (dev_xmit_complete(status))
                                         break;
 
                         }
@@ -352,7 +352,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
 
         }
 
-        if (status != NETDEV_TX_OK) {
+        if (!dev_xmit_complete(status)) {
                 skb_queue_tail(&npinfo->txq, skb);
                 schedule_delayed_work(&npinfo->tx_work,0);
         }
diff --git a/net/core/sock.c b/net/core/sock.c
index d57b0cc995a0..545fac19a711 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1992,6 +1992,19 @@ void skb_set_owner_w(struct sk_buff *skb, struct sock *sk)
 }
 EXPORT_SYMBOL(skb_set_owner_w);
 
+static bool can_skb_orphan_partial(const struct sk_buff *skb)
+{
+#ifdef CONFIG_TLS_DEVICE
+        /* Drivers depend on in-order delivery for crypto offload,
+         * partial orphan breaks out-of-order-OK logic.
+         */
+        if (skb->decrypted)
+                return false;
+#endif
+        return (skb->destructor == sock_wfree ||
+                (IS_ENABLED(CONFIG_INET) && skb->destructor == tcp_wfree));
+}
+
 /* This helper is used by netem, as it can hold packets in its
  * delay queue. We want to allow the owner socket to send more
  * packets, as if they were already TX completed by a typical driver.
@@ -2003,11 +2016,7 @@ void skb_orphan_partial(struct sk_buff *skb)
         if (skb_is_tcp_pure_ack(skb))
                 return;
 
-        if (skb->destructor == sock_wfree
-#ifdef CONFIG_INET
-            || skb->destructor == tcp_wfree
-#endif
-                ) {
+        if (can_skb_orphan_partial(skb)) {
                 struct sock *sk = skb->sk;
 
                 if (refcount_inc_not_zero(&sk->sk_refcnt)) {
@@ -3278,16 +3287,17 @@ static __init int net_inuse_init(void)
 
 core_initcall(net_inuse_init);
 
-static void assign_proto_idx(struct proto *prot)
+static int assign_proto_idx(struct proto *prot)
 {
         prot->inuse_idx = find_first_zero_bit(proto_inuse_idx, PROTO_INUSE_NR);
 
         if (unlikely(prot->inuse_idx == PROTO_INUSE_NR - 1)) {
                 pr_err("PROTO_INUSE_NR exhausted\n");
-                return;
+                return -ENOSPC;
         }
 
         set_bit(prot->inuse_idx, proto_inuse_idx);
+        return 0;
 }
 
 static void release_proto_idx(struct proto *prot)
@@ -3296,8 +3306,9 @@ static void release_proto_idx(struct proto *prot)
                 clear_bit(prot->inuse_idx, proto_inuse_idx);
 }
 #else
-static inline void assign_proto_idx(struct proto *prot)
+static inline int assign_proto_idx(struct proto *prot)
 {
+        return 0;
 }
 
 static inline void release_proto_idx(struct proto *prot)
@@ -3346,6 +3357,8 @@ static int req_prot_init(const struct proto *prot)
 
 int proto_register(struct proto *prot, int alloc_slab)
 {
+        int ret = -ENOBUFS;
+
         if (alloc_slab) {
                 prot->slab = kmem_cache_create_usercopy(prot->name,
                                         prot->obj_size, 0,
@@ -3382,20 +3395,27 @@ int proto_register(struct proto *prot, int alloc_slab)
         }
 
         mutex_lock(&proto_list_mutex);
+        ret = assign_proto_idx(prot);
+        if (ret) {
+                mutex_unlock(&proto_list_mutex);
+                goto out_free_timewait_sock_slab_name;
+        }
         list_add(&prot->node, &proto_list);
-        assign_proto_idx(prot);
         mutex_unlock(&proto_list_mutex);
-        return 0;
+        return ret;
 
 out_free_timewait_sock_slab_name:
-        kfree(prot->twsk_prot->twsk_slab_name);
+        if (alloc_slab && prot->twsk_prot)
+                kfree(prot->twsk_prot->twsk_slab_name);
 out_free_request_sock_slab:
-        req_prot_cleanup(prot->rsk_prot);
+        if (alloc_slab) {
+                req_prot_cleanup(prot->rsk_prot);
 
-        kmem_cache_destroy(prot->slab);
-        prot->slab = NULL;
+                kmem_cache_destroy(prot->slab);
+                prot->slab = NULL;
+        }
 out:
-        return -ENOBUFS;
+        return ret;
 }
 EXPORT_SYMBOL(proto_register);
 
diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
index 3312a5849a97..c13ffbd33d8d 100644
--- a/net/core/sock_diag.c
+++ b/net/core/sock_diag.c
@@ -19,6 +19,7 @@ static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
 static DEFINE_MUTEX(sock_diag_table_mutex);
 static struct workqueue_struct *broadcast_wq;
+static atomic64_t cookie_gen;
 
 u64 sock_gen_cookie(struct sock *sk)
 {
@@ -27,7 +28,7 @@ u64 sock_gen_cookie(struct sock *sk)
 
                 if (res)
                         return res;
-                res = atomic64_inc_return(&sock_net(sk)->cookie_gen);
+                res = atomic64_inc_return(&cookie_gen);
                 atomic64_cmpxchg(&sk->sk_cookie, 0, res);
         }
 }
diff --git a/net/core/stream.c b/net/core/stream.c
index e94bb02a5629..4f1d4aa5fb38 100644
--- a/net/core/stream.c
+++ b/net/core/stream.c
@@ -120,7 +120,6 @@ int sk_stream_wait_memory(struct sock *sk, long *timeo_p)
         int err = 0;
         long vm_wait = 0;
         long current_timeo = *timeo_p;
-        bool noblock = (*timeo_p ? false : true);
         DEFINE_WAIT_FUNC(wait, woken_wake_function);
 
         if (sk_stream_memory_free(sk))
@@ -133,11 +132,8 @@ int sk_stream_wait_memory(struct sock *sk, long *timeo_p)
 
                 if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))
                         goto do_error;
-                if (!*timeo_p) {
-                        if (noblock)
-                                set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
-                        goto do_nonblock;
-                }
+                if (!*timeo_p)
+                        goto do_eagain;
                 if (signal_pending(current))
                         goto do_interrupted;
                 sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);
@@ -169,7 +165,13 @@ out:
 do_error:
         err = -EPIPE;
         goto out;
-do_nonblock:
+do_eagain:
+        /* Make sure that whenever EAGAIN is returned, EPOLLOUT event can
+         * be generated later.
+         * When TCP receives ACK packets that make room, tcp_check_space()
+         * only calls tcp_new_space() if SOCK_NOSPACE is set.
+         */
+        set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
         err = -EAGAIN;
         goto out;
 do_interrupted:
diff --git a/net/dsa/switch.c b/net/dsa/switch.c
index 4ec5b7f85d51..09d9286b27cc 100644
--- a/net/dsa/switch.c
+++ b/net/dsa/switch.c
@@ -153,6 +153,9 @@ static void dsa_switch_mdb_add_bitmap(struct dsa_switch *ds,
 {
         int port;
 
+        if (!ds->ops->port_mdb_add)
+                return;
+
         for_each_set_bit(port, bitmap, ds->num_ports)
                 ds->ops->port_mdb_add(ds, port, mdb);
 }
diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c
index 6ebbd799c4eb..67a1bc635a7b 100644
--- a/net/dsa/tag_8021q.c
+++ b/net/dsa/tag_8021q.c
@@ -28,6 +28,7 @@
  *
  * RSV - VID[9]:
  *      To be used for further expansion of SWITCH_ID or for other purposes.
+ *      Must be transmitted as zero and ignored on receive.
  *
  * SWITCH_ID - VID[8:6]:
  *      Index of switch within DSA tree. Must be between 0 and
@@ -35,6 +36,7 @@
  *
  * RSV - VID[5:4]:
  *      To be used for further expansion of PORT or for other purposes.
+ *      Must be transmitted as zero and ignored on receive.
  *
  * PORT - VID[3:0]:
  *      Index of switch port. Must be between 0 and DSA_MAX_PORTS - 1.
diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
index e4aba5d485be..bbe9b3b2d395 100644
--- a/net/ieee802154/6lowpan/reassembly.c
+++ b/net/ieee802154/6lowpan/reassembly.c
@@ -170,7 +170,7 @@ static int lowpan_frag_reasm(struct lowpan_frag_queue *fq, struct sk_buff *skb,
         reasm_data = inet_frag_reasm_prepare(&fq->q, skb, prev_tail);
         if (!reasm_data)
                 goto out_oom;
-        inet_frag_reasm_finish(&fq->q, skb, reasm_data);
+        inet_frag_reasm_finish(&fq->q, skb, reasm_data, false);
 
         skb->dev = ldev;
         skb->tstamp = fq->q.stamp;
diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c
index dacbd58e1799..badc5cfe4dc6 100644
--- a/net/ieee802154/socket.c
+++ b/net/ieee802154/socket.c
@@ -1092,7 +1092,7 @@ static struct packet_type ieee802154_packet_type = {
 
 static int __init af_ieee802154_init(void)
 {
-        int rc = -EINVAL;
+        int rc;
 
         rc = proto_register(&ieee802154_raw_prot, 1);
         if (rc)
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 2b2b3d291ab0..1ab2fb6bb37d 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -2145,7 +2145,7 @@ static int fn_trie_dump_leaf(struct key_vector *l, struct fib_table *tb,
 
                 if (filter->dump_exceptions) {
                         err = fib_dump_info_fnhe(skb, cb, tb->tb_id, fi,
-                                                 &i_fa, s_fa);
+                                                 &i_fa, s_fa, flags);
                         if (err < 0)
                                 goto stop;
                 }
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 1510e951f451..4298aae74e0e 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -582,7 +582,13 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info,
 
         if (!rt)
                 goto out;
-        net = dev_net(rt->dst.dev);
+
+        if (rt->dst.dev)
+                net = dev_net(rt->dst.dev);
+        else if (skb_in->dev)
+                net = dev_net(skb_in->dev);
+        else
+                goto out;
 
         /*
          *      Find the original header. It is expected to be valid, of course.
@@ -902,7 +908,7 @@ static bool icmp_redirect(struct sk_buff *skb)
                 return false;
         }
 
-        icmp_socket_deliver(skb, icmp_hdr(skb)->un.gateway);
+        icmp_socket_deliver(skb, ntohl(icmp_hdr(skb)->un.gateway));
         return true;
 }
 
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 180f6896b98b..480d0b22db1a 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -1475,7 +1475,7 @@ EXPORT_SYMBOL(__ip_mc_inc_group);
 
 void ip_mc_inc_group(struct in_device *in_dev, __be32 addr)
 {
-        __ip_mc_inc_group(in_dev, addr, MCAST_EXCLUDE);
+        __ip_mc_inc_group(in_dev, addr, GFP_KERNEL);
 }
 EXPORT_SYMBOL(ip_mc_inc_group);
 
@@ -2197,7 +2197,7 @@ static int __ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr,
         iml->sflist = NULL;
         iml->sfmode = mode;
         rcu_assign_pointer(inet->mc_list, iml);
-        __ip_mc_inc_group(in_dev, addr, mode);
+        ____ip_mc_inc_group(in_dev, addr, mode, GFP_KERNEL);
         err = 0;
 done:
         return err;
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index a999451345f9..10d31733297d 100644
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -475,11 +475,12 @@ void *inet_frag_reasm_prepare(struct inet_frag_queue *q, struct sk_buff *skb,
 EXPORT_SYMBOL(inet_frag_reasm_prepare);
 
 void inet_frag_reasm_finish(struct inet_frag_queue *q, struct sk_buff *head,
-                            void *reasm_data)
+                            void *reasm_data, bool try_coalesce)
 {
         struct sk_buff **nextp = (struct sk_buff **)reasm_data;
         struct rb_node *rbn;
         struct sk_buff *fp;
+        int sum_truesize;
 
         skb_push(head, head->data - skb_network_header(head));
 
@@ -487,25 +488,41 @@ void inet_frag_reasm_finish(struct inet_frag_queue *q, struct sk_buff *head,
         fp = FRAG_CB(head)->next_frag;
         rbn = rb_next(&head->rbnode);
         rb_erase(&head->rbnode, &q->rb_fragments);
+
+        sum_truesize = head->truesize;
         while (rbn || fp) {
                 /* fp points to the next sk_buff in the current run;
                  * rbn points to the next run.
                  */
                 /* Go through the current run. */
                 while (fp) {
-                        *nextp = fp;
-                        nextp = &fp->next;
-                        fp->prev = NULL;
-                        memset(&fp->rbnode, 0, sizeof(fp->rbnode));
-                        fp->sk = NULL;
-                        head->data_len += fp->len;
-                        head->len += fp->len;
+                        struct sk_buff *next_frag = FRAG_CB(fp)->next_frag;
+                        bool stolen;
+                        int delta;
+
+                        sum_truesize += fp->truesize;
                         if (head->ip_summed != fp->ip_summed)
                                 head->ip_summed = CHECKSUM_NONE;
                         else if (head->ip_summed == CHECKSUM_COMPLETE)
                                 head->csum = csum_add(head->csum, fp->csum);
-                        head->truesize += fp->truesize;
-                        fp = FRAG_CB(fp)->next_frag;
+
+                        if (try_coalesce && skb_try_coalesce(head, fp, &stolen,
+                                                             &delta)) {
+                                kfree_skb_partial(fp, stolen);
+                        } else {
+                                fp->prev = NULL;
+                                memset(&fp->rbnode, 0, sizeof(fp->rbnode));
+                                fp->sk = NULL;
+
+                                head->data_len += fp->len;
+                                head->len += fp->len;
+                                head->truesize += fp->truesize;
+
+                                *nextp = fp;
+                                nextp = &fp->next;
+                        }
+
+                        fp = next_frag;
                 }
                 /* Move to the next run. */
                 if (rbn) {
@@ -516,7 +533,7 @@ void inet_frag_reasm_finish(struct inet_frag_queue *q, struct sk_buff *head,
                         rbn = rbnext;
                 }
         }
-        sub_frag_mem_limit(q->fqdir, head->truesize);
+        sub_frag_mem_limit(q->fqdir, sum_truesize);
 
         *nextp = NULL;
         skb_mark_not_on_list(head);
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 4385eb9e781f..cfeb8890f94e 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -393,6 +393,11 @@ err:
         return err;
 }
 
+static bool ip_frag_coalesce_ok(const struct ipq *qp)
+{
+        return qp->q.key.v4.user == IP_DEFRAG_LOCAL_DELIVER;
+}
+
 /* Build a new IP datagram from all its fragments. */
 static int ip_frag_reasm(struct ipq *qp, struct sk_buff *skb,
                          struct sk_buff *prev_tail, struct net_device *dev)
@@ -421,7 +426,8 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *skb,
         if (len > 65535)
                 goto out_oversize;
 
-        inet_frag_reasm_finish(&qp->q, skb, reasm_data);
+        inet_frag_reasm_finish(&qp->q, skb, reasm_data,
+                               ip_frag_coalesce_ok(qp));
 
         skb->dev = dev;
         IPCB(skb)->frag_max_size = max(qp->max_df_size, qp->q.max_size);
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 517300d587a7..b6a6f18c3dd1 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2728,7 +2728,8 @@ EXPORT_SYMBOL_GPL(ip_route_output_flow);
 /* called with rcu_read_lock held */
 static int rt_fill_info(struct net *net, __be32 dst, __be32 src,
                         struct rtable *rt, u32 table_id, struct flowi4 *fl4,
-                        struct sk_buff *skb, u32 portid, u32 seq)
+                        struct sk_buff *skb, u32 portid, u32 seq,
+                        unsigned int flags)
 {
         struct rtmsg *r;
         struct nlmsghdr *nlh;
@@ -2736,7 +2737,7 @@ static int rt_fill_info(struct net *net, __be32 dst, __be32 src,
         u32 error;
         u32 metrics[RTAX_MAX];
 
-        nlh = nlmsg_put(skb, portid, seq, RTM_NEWROUTE, sizeof(*r), 0);
+        nlh = nlmsg_put(skb, portid, seq, RTM_NEWROUTE, sizeof(*r), flags);
         if (!nlh)
                 return -EMSGSIZE;
 
@@ -2860,7 +2861,7 @@ nla_put_failure:
 static int fnhe_dump_bucket(struct net *net, struct sk_buff *skb,
                             struct netlink_callback *cb, u32 table_id,
                             struct fnhe_hash_bucket *bucket, int genid,
-                            int *fa_index, int fa_start)
+                            int *fa_index, int fa_start, unsigned int flags)
 {
         int i;
 
@@ -2891,7 +2892,7 @@ static int fnhe_dump_bucket(struct net *net, struct sk_buff *skb,
                         err = rt_fill_info(net, fnhe->fnhe_daddr, 0, rt,
                                            table_id, NULL, skb,
                                            NETLINK_CB(cb->skb).portid,
-                                           cb->nlh->nlmsg_seq);
+                                           cb->nlh->nlmsg_seq, flags);
                         if (err)
                                 return err;
 next:
@@ -2904,7 +2905,7 @@ next:
 
 int fib_dump_info_fnhe(struct sk_buff *skb, struct netlink_callback *cb,
                        u32 table_id, struct fib_info *fi,
-                       int *fa_index, int fa_start)
+                       int *fa_index, int fa_start, unsigned int flags)
 {
         struct net *net = sock_net(cb->skb->sk);
         int nhsel, genid = fnhe_genid(net);
@@ -2922,7 +2923,8 @@ int fib_dump_info_fnhe(struct sk_buff *skb, struct netlink_callback *cb,
                 err = 0;
                 if (bucket)
                         err = fnhe_dump_bucket(net, skb, cb, table_id, bucket,
-                                               genid, fa_index, fa_start);
+                                               genid, fa_index, fa_start,
+                                               flags);
                 rcu_read_unlock();
                 if (err)
                         return err;
@@ -3183,7 +3185,8 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,
                                     fl4.flowi4_tos, res.fi, 0);
         } else {
                 err = rt_fill_info(net, dst, src, rt, table_id, &fl4, skb,
-                                   NETLINK_CB(in_skb).portid, nlh->nlmsg_seq);
+                                   NETLINK_CB(in_skb).portid,
+                                   nlh->nlmsg_seq, 0);
         }
         if (err < 0)
                 goto errout_rcu;
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 776905899ac0..61082065b26a 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -935,6 +935,22 @@ static int tcp_send_mss(struct sock *sk, int *size_goal, int flags)
         return mss_now;
 }
 
+/* In some cases, both sendpage() and sendmsg() could have added
+ * an skb to the write queue, but failed adding payload on it.
+ * We need to remove it to consume less memory, but more
+ * importantly be able to generate EPOLLOUT for Edge Trigger epoll()
+ * users.
+ */
+static void tcp_remove_empty_skb(struct sock *sk, struct sk_buff *skb)
+{
+        if (skb && !skb->len) {
+                tcp_unlink_write_queue(skb, sk);
+                if (tcp_write_queue_empty(sk))
+                        tcp_chrono_stop(sk, TCP_CHRONO_BUSY);
+                sk_wmem_free_skb(sk, skb);
+        }
+}
+
 ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,
                          size_t size, int flags)
 {
@@ -984,6 +1000,9 @@ new_segment:
                         if (!skb)
                                 goto wait_for_memory;
 
+#ifdef CONFIG_TLS_DEVICE
+                        skb->decrypted = !!(flags & MSG_SENDPAGE_DECRYPTED);
+#endif
                         skb_entail(sk, skb);
                         copy = size_goal;
                 }
@@ -1061,6 +1080,7 @@ out:
         return copied;
 
 do_error:
+        tcp_remove_empty_skb(sk, tcp_write_queue_tail(sk));
         if (copied)
                 goto out;
 out_err:
@@ -1385,18 +1405,11 @@ out_nopush:
         sock_zerocopy_put(uarg);
         return copied + copied_syn;
 
+do_error:
+        skb = tcp_write_queue_tail(sk);
 do_fault:
-        if (!skb->len) {
-                tcp_unlink_write_queue(skb, sk);
-                /* It is the one place in all of TCP, except connection
-                 * reset, where we can be unlinking the send_head.
-                 */
-                if (tcp_write_queue_empty(sk))
-                        tcp_chrono_stop(sk, TCP_CHRONO_BUSY);
-                sk_wmem_free_skb(sk, skb);
-        }
+        tcp_remove_empty_skb(sk, skb);
 
-do_error:
         if (copied + copied_syn)
                 goto out;
 out_err:
diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c
index 3d1e15401384..8a56e09cfb0e 100644
--- a/net/ipv4/tcp_bpf.c
+++ b/net/ipv4/tcp_bpf.c
@@ -398,10 +398,14 @@ more_data:
 static int tcp_bpf_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
 {
         struct sk_msg tmp, *msg_tx = NULL;
-        int flags = msg->msg_flags | MSG_NO_SHARED_FRAGS;
         int copied = 0, err = 0;
         struct sk_psock *psock;
         long timeo;
+        int flags;
+
+        /* Don't let internal do_tcp_sendpages() flags through */
+        flags = (msg->msg_flags & ~MSG_SENDPAGE_DECRYPTED);
+        flags |= MSG_NO_SHARED_FRAGS;
 
         psock = sk_psock_get(sk);
         if (unlikely(!psock))
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 6e4afc48d7bb..8a645f304e6c 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1320,6 +1320,7 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,
         buff = sk_stream_alloc_skb(sk, nsize, gfp, true);
         if (!buff)
                 return -ENOMEM; /* We'll just try again later. */
+        skb_copy_decrypted(buff, skb);
 
         sk->sk_wmem_queued += buff->truesize;
         sk_mem_charge(sk, buff->truesize);
@@ -1874,6 +1875,7 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len,
         buff = sk_stream_alloc_skb(sk, 0, gfp, true);
         if (unlikely(!buff))
                 return -ENOMEM;
+        skb_copy_decrypted(buff, skb);
 
         sk->sk_wmem_queued += buff->truesize;
         sk_mem_charge(sk, buff->truesize);
@@ -2051,7 +2053,7 @@ static bool tcp_can_coalesce_send_queue_head(struct sock *sk, int len)
                 if (len <= skb->len)
                         break;
 
-                if (unlikely(TCP_SKB_CB(skb)->eor))
+                if (unlikely(TCP_SKB_CB(skb)->eor) || tcp_has_tx_tstamp(skb))
                         return false;
 
                 len -= skb->len;
@@ -2143,6 +2145,7 @@ static int tcp_mtu_probe(struct sock *sk)
         sk_mem_charge(sk, nskb->truesize);
 
         skb = tcp_send_head(sk);
+        skb_copy_decrypted(nskb, skb);
 
         TCP_SKB_CB(nskb)->seq = TCP_SKB_CB(skb)->seq;
         TCP_SKB_CB(nskb)->end_seq = TCP_SKB_CB(skb)->seq + probe_size;
@@ -2167,6 +2170,7 @@ static int tcp_mtu_probe(struct sock *sk)
                          * we need to propagate it to the new skb.
                          */
                         TCP_SKB_CB(nskb)->eor = TCP_SKB_CB(skb)->eor;
+                        tcp_skb_collapse_tstamp(nskb, skb);
                         tcp_unlink_write_queue(skb, sk);
                         sk_wmem_free_skb(sk, skb);
                 } else {
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index dc73888c7859..6a576ff92c39 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -478,7 +478,7 @@ static struct inet6_dev *ipv6_find_idev(struct net_device *dev)
         if (!idev) {
                 idev = ipv6_add_dev(dev);
                 if (IS_ERR(idev))
-                        return NULL;
+                        return idev;
         }
 
         if (dev->flags&IFF_UP)
@@ -1045,7 +1045,8 @@ ipv6_add_addr(struct inet6_dev *idev, struct ifa6_config *cfg,
         int err = 0;
 
         if (addr_type == IPV6_ADDR_ANY ||
-            addr_type & IPV6_ADDR_MULTICAST ||
+            (addr_type & IPV6_ADDR_MULTICAST &&
+             !(cfg->ifa_flags & IFA_F_MCAUTOJOIN)) ||
             (!(idev->dev->flags & IFF_LOOPBACK) &&
              !netif_is_l3_master(idev->dev) &&
              addr_type & IPV6_ADDR_LOOPBACK))
@@ -2465,8 +2466,8 @@ static struct inet6_dev *addrconf_add_dev(struct net_device *dev)
         ASSERT_RTNL();
 
         idev = ipv6_find_idev(dev);
-        if (!idev)
-                return ERR_PTR(-ENOBUFS);
+        if (IS_ERR(idev))
+                return idev;
 
         if (idev->cnf.disable_ipv6)
                 return ERR_PTR(-EACCES);
@@ -3158,7 +3159,7 @@ static void init_loopback(struct net_device *dev)
         ASSERT_RTNL();
 
         idev = ipv6_find_idev(dev);
-        if (!idev) {
+        if (IS_ERR(idev)) {
                 pr_debug("%s: add_dev failed\n", __func__);
                 return;
         }
@@ -3373,7 +3374,7 @@ static void addrconf_sit_config(struct net_device *dev)
          */
 
         idev = ipv6_find_idev(dev);
-        if (!idev) {
+        if (IS_ERR(idev)) {
                 pr_debug("%s: add_dev failed\n", __func__);
                 return;
         }
@@ -3398,7 +3399,7 @@ static void addrconf_gre_config(struct net_device *dev)
         ASSERT_RTNL();
 
         idev = ipv6_find_idev(dev);
-        if (!idev) {
+        if (IS_ERR(idev)) {
                 pr_debug("%s: add_dev failed\n", __func__);
                 return;
         }
@@ -4772,8 +4773,8 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,
                          IFA_F_MCAUTOJOIN | IFA_F_OPTIMISTIC;
 
         idev = ipv6_find_idev(dev);
-        if (!idev)
-                return -ENOBUFS;
+        if (IS_ERR(idev))
+                return PTR_ERR(idev);
 
         if (!ipv6_allow_optimistic_dad(net, idev))
                 cfg.ifa_flags &= ~IFA_F_OPTIMISTIC;
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 7f3f13c37916..eaa4c2cc2fbb 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -787,14 +787,15 @@ static void mld_del_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im)
         if (pmc) {
                 im->idev = pmc->idev;
                 if (im->mca_sfmode == MCAST_INCLUDE) {
-                        im->mca_tomb = pmc->mca_tomb;
-                        im->mca_sources = pmc->mca_sources;
+                        swap(im->mca_tomb, pmc->mca_tomb);
+                        swap(im->mca_sources, pmc->mca_sources);
                         for (psf = im->mca_sources; psf; psf = psf->sf_next)
                                 psf->sf_crcount = idev->mc_qrv;
                 } else {
                         im->mca_crcount = idev->mc_qrv;
                 }
                 in6_dev_put(pmc->idev);
+                ip6_mc_clear_src(pmc);
                 kfree(pmc);
         }
         spin_unlock_bh(&im->mca_lock);
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 0f82c150543b..fed9666a2f7d 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -348,7 +348,7 @@ static int nf_ct_frag6_reasm(struct frag_queue *fq, struct sk_buff *skb,
 
         skb_reset_transport_header(skb);
 
-        inet_frag_reasm_finish(&fq->q, skb, reasm_data);
+        inet_frag_reasm_finish(&fq->q, skb, reasm_data, false);
 
         skb->ignore_df = 1;
         skb->dev = dev;
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index ca05b16f1bb9..1f5d4d196dcc 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -282,7 +282,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *skb,
 
         skb_reset_transport_header(skb);
 
-        inet_frag_reasm_finish(&fq->q, skb, reasm_data);
+        inet_frag_reasm_finish(&fq->q, skb, reasm_data, true);
 
         skb->dev = dev;
         ipv6_hdr(skb)->payload_len = htons(payload_len);
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 4d458067d80d..111c400199ec 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1546,6 +1546,11 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
         if (is_multicast_ether_addr(mac))
                 return -EINVAL;
 
+        if (params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER) &&
+            sdata->vif.type == NL80211_IFTYPE_STATION &&
+            !sdata->u.mgd.associated)
+                return -EINVAL;
+
         sta = sta_info_alloc(sdata, mac, GFP_KERNEL);
         if (!sta)
                 return -ENOMEM;
@@ -1553,10 +1558,6 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
         if (params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER))
                 sta->sta.tdls = true;
 
-        if (sta->sta.tdls && sdata->vif.type == NL80211_IFTYPE_STATION &&
-            !sdata->u.mgd.associated)
-                return -EINVAL;
-
         err = sta_apply_parameters(local, sta, params);
         if (err) {
                 sta_info_free(local, sta);
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 3c1ab870fefe..768d14c9a716 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2447,11 +2447,13 @@ static void ieee80211_deliver_skb_to_local_stack(struct sk_buff *skb,
                       skb->protocol == cpu_to_be16(ETH_P_PREAUTH)) &&
                      sdata->control_port_over_nl80211)) {
                 struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
-                bool noencrypt = status->flag & RX_FLAG_DECRYPTED;
+                bool noencrypt = !(status->flag & RX_FLAG_DECRYPTED);
 
                 cfg80211_rx_control_port(dev, skb, noencrypt);
                 dev_kfree_skb(skb);
         } else {
+                memset(skb->cb, 0, sizeof(skb->cb));
+
                 /* deliver to local stack */
                 if (rx->napi)
                         napi_gro_receive(rx->napi, skb);
@@ -2546,8 +2548,6 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
 
         if (skb) {
                 skb->protocol = eth_type_trans(skb, dev);
-                memset(skb->cb, 0, sizeof(skb->cb));
-
                 ieee80211_deliver_skb_to_local_stack(skb, rx);
         }
 
diff --git a/net/mpls/mpls_iptunnel.c b/net/mpls/mpls_iptunnel.c
index d25e91d7bdc1..44b675016393 100644
--- a/net/mpls/mpls_iptunnel.c
+++ b/net/mpls/mpls_iptunnel.c
@@ -133,12 +133,12 @@ static int mpls_xmit(struct sk_buff *skb)
         mpls_stats_inc_outucastpkts(out_dev, skb);
 
         if (rt) {
-                if (rt->rt_gw_family == AF_INET)
-                        err = neigh_xmit(NEIGH_ARP_TABLE, out_dev, &rt->rt_gw4,
-                                         skb);
-                else if (rt->rt_gw_family == AF_INET6)
+                if (rt->rt_gw_family == AF_INET6)
                         err = neigh_xmit(NEIGH_ND_TABLE, out_dev, &rt->rt_gw6,
                                          skb);
+                else
+                        err = neigh_xmit(NEIGH_ARP_TABLE, out_dev, &rt->rt_gw4,
+                                         skb);
         } else if (rt6) {
                 if (ipv6_addr_v4mapped(&rt6->rt6i_gateway)) {
                         /* 6PE (RFC 4798) */
diff --git a/net/ncsi/ncsi-cmd.c b/net/ncsi/ncsi-cmd.c
index 5c3fad8cba57..0187e65176c0 100644
--- a/net/ncsi/ncsi-cmd.c
+++ b/net/ncsi/ncsi-cmd.c
@@ -54,7 +54,7 @@ static void ncsi_cmd_build_header(struct ncsi_pkt_hdr *h,
         checksum = ncsi_calculate_checksum((unsigned char *)h,
                                            sizeof(*h) + nca->payload);
         pchecksum = (__be32 *)((void *)h + sizeof(struct ncsi_pkt_hdr) +
-                    nca->payload);
+                    ALIGN(nca->payload, 4));
         *pchecksum = htonl(checksum);
 }
 
@@ -309,14 +309,21 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
 
 int ncsi_xmit_cmd(struct ncsi_cmd_arg *nca)
 {
+        struct ncsi_cmd_handler *nch = NULL;
         struct ncsi_request *nr;
+        unsigned char type;
         struct ethhdr *eh;
-        struct ncsi_cmd_handler *nch = NULL;
         int i, ret;
 
+        /* Use OEM generic handler for Netlink request */
+        if (nca->req_flags == NCSI_REQ_FLAG_NETLINK_DRIVEN)
+                type = NCSI_PKT_CMD_OEM;
+        else
+                type = nca->type;
+
         /* Search for the handler */
         for (i = 0; i < ARRAY_SIZE(ncsi_cmd_handlers); i++) {
-                if (ncsi_cmd_handlers[i].type == nca->type) {
+                if (ncsi_cmd_handlers[i].type == type) {
                         if (ncsi_cmd_handlers[i].handler)
                                 nch = &ncsi_cmd_handlers[i];
                         else
diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c
index 7581bf919885..d876bd55f356 100644
--- a/net/ncsi/ncsi-rsp.c
+++ b/net/ncsi/ncsi-rsp.c
@@ -47,7 +47,8 @@ static int ncsi_validate_rsp_pkt(struct ncsi_request *nr,
         if (ntohs(h->code) != NCSI_PKT_RSP_C_COMPLETED ||
             ntohs(h->reason) != NCSI_PKT_RSP_R_NO_ERROR) {
                 netdev_dbg(nr->ndp->ndev.dev,
-                           "NCSI: non zero response/reason code\n");
+                           "NCSI: non zero response/reason code %04xh, %04xh\n",
+                            ntohs(h->code), ntohs(h->reason));
                 return -EPERM;
         }
 
@@ -55,7 +56,7 @@ static int ncsi_validate_rsp_pkt(struct ncsi_request *nr,
          * sender doesn't support checksum according to NCSI
          * specification.
          */
-        pchecksum = (__be32 *)((void *)(h + 1) + payload - 4);
+        pchecksum = (__be32 *)((void *)(h + 1) + ALIGN(payload, 4) - 4);
         if (ntohl(*pchecksum) == 0)
                 return 0;
 
@@ -63,7 +64,9 @@ static int ncsi_validate_rsp_pkt(struct ncsi_request *nr,
                                            sizeof(*h) + payload - 4);
 
         if (*pchecksum != htonl(checksum)) {
-                netdev_dbg(nr->ndp->ndev.dev, "NCSI: checksum mismatched\n");
+                netdev_dbg(nr->ndp->ndev.dev,
+                           "NCSI: checksum mismatched; recd: %08x calc: %08x\n",
+                           *pchecksum, htonl(checksum));
                 return -EINVAL;
         }
 
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index a542761e90d1..81a8ef42b88d 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -453,13 +453,12 @@ EXPORT_SYMBOL_GPL(nf_ct_invert_tuple);
  * table location, we assume id gets exposed to userspace.
  *
  * Following nf_conn items do not change throughout lifetime
- * of the nf_conn after it has been committed to main hash table:
+ * of the nf_conn:
  *
  * 1. nf_conn address
- * 2. nf_conn->ext address
- * 3. nf_conn->master address (normally NULL)
- * 4. tuple
- * 5. the associated net namespace
+ * 2. nf_conn->master address (normally NULL)
+ * 3. the associated net namespace
+ * 4. the original direction tuple
  */
 u32 nf_ct_get_id(const struct nf_conn *ct)
 {
@@ -469,9 +468,10 @@ u32 nf_ct_get_id(const struct nf_conn *ct)
         net_get_random_once(&ct_id_seed, sizeof(ct_id_seed));
 
         a = (unsigned long)ct;
-        b = (unsigned long)ct->master ^ net_hash_mix(nf_ct_net(ct));
-        c = (unsigned long)ct->ext;
-        d = (unsigned long)siphash(&ct->tuplehash, sizeof(ct->tuplehash),
+        b = (unsigned long)ct->master;
+        c = (unsigned long)nf_ct_net(ct);
+        d = (unsigned long)siphash(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple,
+                                   sizeof(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple),
                                    &ct_id_seed);
 #ifdef CONFIG_64BIT
         return siphash_4u64((u64)a, (u64)b, (u64)c, (u64)d, &ct_id_seed);
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index 0ecb3e289ef2..8d96738b7dfd 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -322,7 +322,7 @@ static int find_pattern(const char *data, size_t dlen,
                 i++;
         }
 
-        pr_debug("Skipped up to `%c'!\n", skip);
+        pr_debug("Skipped up to 0x%hhx delimiter!\n", skip);
 
         *numoff = i;
         *numlen = getnum(data + i, dlen - i, cmd, term, numoff);
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index e0d392cb3075..0006503d2da9 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -1037,9 +1037,14 @@ static int nf_conntrack_standalone_init_sysctl(struct net *net)
         table[NF_SYSCTL_CT_COUNT].data = &net->ct.count;
         table[NF_SYSCTL_CT_CHECKSUM].data = &net->ct.sysctl_checksum;
         table[NF_SYSCTL_CT_LOG_INVALID].data = &net->ct.sysctl_log_invalid;
+        table[NF_SYSCTL_CT_ACCT].data = &net->ct.sysctl_acct;
+        table[NF_SYSCTL_CT_HELPER].data = &net->ct.sysctl_auto_assign_helper;
 #ifdef CONFIG_NF_CONNTRACK_EVENTS
         table[NF_SYSCTL_CT_EVENTS].data = &net->ct.sysctl_events;
 #endif
+#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
+        table[NF_SYSCTL_CT_TIMESTAMP].data = &net->ct.sysctl_tstamp;
+#endif
         table[NF_SYSCTL_CT_PROTO_TIMEOUT_GENERIC].data = &nf_generic_pernet(net)->timeout;
         table[NF_SYSCTL_CT_PROTO_TIMEOUT_ICMP].data = &nf_icmp_pernet(net)->timeout;
         table[NF_SYSCTL_CT_PROTO_TIMEOUT_ICMPV6].data = &nf_icmpv6_pernet(net)->timeout;
diff --git a/net/netfilter/nf_flow_table_core.c b/net/netfilter/nf_flow_table_core.c
index e3d797252a98..80a8f9ae4c93 100644
--- a/net/netfilter/nf_flow_table_core.c
+++ b/net/netfilter/nf_flow_table_core.c
@@ -111,15 +111,16 @@ static void flow_offload_fixup_tcp(struct ip_ct_tcp *tcp)
 #define NF_FLOWTABLE_TCP_PICKUP_TIMEOUT (120 * HZ)
 #define NF_FLOWTABLE_UDP_PICKUP_TIMEOUT (30 * HZ)
 
-static void flow_offload_fixup_ct_state(struct nf_conn *ct)
+static inline __s32 nf_flow_timeout_delta(unsigned int timeout)
+{
+        return (__s32)(timeout - (u32)jiffies);
+}
+
+static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)
 {
         const struct nf_conntrack_l4proto *l4proto;
+        int l4num = nf_ct_protonum(ct);
         unsigned int timeout;
-        int l4num;
-
-        l4num = nf_ct_protonum(ct);
-        if (l4num == IPPROTO_TCP)
-                flow_offload_fixup_tcp(&ct->proto.tcp);
 
         l4proto = nf_ct_l4proto_find(l4num);
         if (!l4proto)
@@ -132,7 +133,20 @@ static void flow_offload_fixup_ct_state(struct nf_conn *ct)
         else
                 return;
 
-        ct->timeout = nfct_time_stamp + timeout;
+        if (nf_flow_timeout_delta(ct->timeout) > (__s32)timeout)
+                ct->timeout = nfct_time_stamp + timeout;
+}
+
+static void flow_offload_fixup_ct_state(struct nf_conn *ct)
+{
+        if (nf_ct_protonum(ct) == IPPROTO_TCP)
+                flow_offload_fixup_tcp(&ct->proto.tcp);
+}
+
+static void flow_offload_fixup_ct(struct nf_conn *ct)
+{
+        flow_offload_fixup_ct_state(ct);
+        flow_offload_fixup_ct_timeout(ct);
 }
 
 void flow_offload_free(struct flow_offload *flow)
@@ -208,6 +222,11 @@ int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow)
 }
 EXPORT_SYMBOL_GPL(flow_offload_add);
 
+static inline bool nf_flow_has_expired(const struct flow_offload *flow)
+{
+        return nf_flow_timeout_delta(flow->timeout) <= 0;
+}
+
 static void flow_offload_del(struct nf_flowtable *flow_table,
                              struct flow_offload *flow)
 {
@@ -223,6 +242,11 @@ static void flow_offload_del(struct nf_flowtable *flow_table,
         e = container_of(flow, struct flow_offload_entry, flow);
         clear_bit(IPS_OFFLOAD_BIT, &e->ct->status);
 
+        if (nf_flow_has_expired(flow))
+                flow_offload_fixup_ct(e->ct);
+        else if (flow->flags & FLOW_OFFLOAD_TEARDOWN)
+                flow_offload_fixup_ct_timeout(e->ct);
+
         flow_offload_free(flow);
 }
 
@@ -298,11 +322,6 @@ nf_flow_table_iterate(struct nf_flowtable *flow_table,
         return err;
 }
 
-static inline bool nf_flow_has_expired(const struct flow_offload *flow)
-{
-        return (__s32)(flow->timeout - (u32)jiffies) <= 0;
-}
-
 static void nf_flow_offload_gc_step(struct flow_offload *flow, void *data)
 {
         struct nf_flowtable *flow_table = data;
diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c
index cdfc33517e85..b9e7dd6e60ce 100644
--- a/net/netfilter/nf_flow_table_ip.c
+++ b/net/netfilter/nf_flow_table_ip.c
@@ -214,6 +214,24 @@ static bool nf_flow_exceeds_mtu(const struct sk_buff *skb, unsigned int mtu)
         return true;
 }
 
+static int nf_flow_offload_dst_check(struct dst_entry *dst)
+{
+        if (unlikely(dst_xfrm(dst)))
+                return dst_check(dst, 0) ? 0 : -1;
+
+        return 0;
+}
+
+static unsigned int nf_flow_xmit_xfrm(struct sk_buff *skb,
+                                      const struct nf_hook_state *state,
+                                      struct dst_entry *dst)
+{
+        skb_orphan(skb);
+        skb_dst_set_noref(skb, dst);
+        dst_output(state->net, state->sk, skb);
+        return NF_STOLEN;
+}
+
 unsigned int
 nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,
                         const struct nf_hook_state *state)
@@ -254,12 +272,25 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,
         if (nf_flow_state_check(flow, ip_hdr(skb)->protocol, skb, thoff))
                 return NF_ACCEPT;
 
+        if (nf_flow_offload_dst_check(&rt->dst)) {
+                flow_offload_teardown(flow);
+                return NF_ACCEPT;
+        }
+
         if (nf_flow_nat_ip(flow, skb, thoff, dir) < 0)
                 return NF_DROP;
 
         flow->timeout = (u32)jiffies + NF_FLOW_TIMEOUT;
         iph = ip_hdr(skb);
         ip_decrease_ttl(iph);
+        skb->tstamp = 0;
+
+        if (unlikely(dst_xfrm(&rt->dst))) {
+                memset(skb->cb, 0, sizeof(struct inet_skb_parm));
+                IPCB(skb)->iif = skb->dev->ifindex;
+                IPCB(skb)->flags = IPSKB_FORWARDED;
+                return nf_flow_xmit_xfrm(skb, state, &rt->dst);
+        }
 
         skb->dev = outdev;
         nexthop = rt_nexthop(rt, flow->tuplehash[!dir].tuple.src_v4.s_addr);
@@ -467,6 +498,11 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb,
                                 sizeof(*ip6h)))
                 return NF_ACCEPT;
 
+        if (nf_flow_offload_dst_check(&rt->dst)) {
+                flow_offload_teardown(flow);
+                return NF_ACCEPT;
+        }
+
         if (skb_try_make_writable(skb, sizeof(*ip6h)))
                 return NF_DROP;
 
@@ -476,6 +512,14 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb,
         flow->timeout = (u32)jiffies + NF_FLOW_TIMEOUT;
         ip6h = ipv6_hdr(skb);
         ip6h->hop_limit--;
+        skb->tstamp = 0;
+
+        if (unlikely(dst_xfrm(&rt->dst))) {
+                memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
+                IP6CB(skb)->iif = skb->dev->ifindex;
+                IP6CB(skb)->flags = IP6SKB_FORWARDED;
+                return nf_flow_xmit_xfrm(skb, state, &rt->dst);
+        }
 
         skb->dev = outdev;
         nexthop = rt6_nexthop(rt, &flow->tuplehash[!dir].tuple.src_v6);
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 605a7cfe7ca7..d47469f824a1 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -138,9 +138,14 @@ static void nft_set_trans_bind(const struct nft_ctx *ctx, struct nft_set *set)
                 return;
 
         list_for_each_entry_reverse(trans, &net->nft.commit_list, list) {
-                if (trans->msg_type == NFT_MSG_NEWSET &&
-                    nft_trans_set(trans) == set) {
-                        set->bound = true;
+                switch (trans->msg_type) {
+                case NFT_MSG_NEWSET:
+                        if (nft_trans_set(trans) == set)
+                                nft_trans_set_bound(trans) = true;
+                        break;
+                case NFT_MSG_NEWSETELEM:
+                        if (nft_trans_elem_set(trans) == set)
+                                nft_trans_elem_set_bound(trans) = true;
                         break;
                 }
         }
@@ -1662,6 +1667,10 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask,
 
                 chain->flags |= NFT_BASE_CHAIN | flags;
                 basechain->policy = NF_ACCEPT;
+                if (chain->flags & NFT_CHAIN_HW_OFFLOAD &&
+                    nft_chain_offload_priority(basechain) < 0)
+                        return -EOPNOTSUPP;
+
                 flow_block_init(&basechain->flow_block);
         } else {
                 chain = kzalloc(sizeof(*chain), GFP_KERNEL);
@@ -6906,7 +6915,7 @@ static int __nf_tables_abort(struct net *net)
                         break;
                 case NFT_MSG_NEWSET:
                         trans->ctx.table->use--;
-                        if (nft_trans_set(trans)->bound) {
+                        if (nft_trans_set_bound(trans)) {
                                 nft_trans_destroy(trans);
                                 break;
                         }
@@ -6918,7 +6927,7 @@ static int __nf_tables_abort(struct net *net)
                         nft_trans_destroy(trans);
                         break;
                 case NFT_MSG_NEWSETELEM:
-                        if (nft_trans_elem_set(trans)->bound) {
+                        if (nft_trans_elem_set_bound(trans)) {
                                 nft_trans_destroy(trans);
                                 break;
                         }
diff --git a/net/netfilter/nf_tables_offload.c b/net/netfilter/nf_tables_offload.c
index 64f5fd5f240e..c0d18c1d77ac 100644
--- a/net/netfilter/nf_tables_offload.c
+++ b/net/netfilter/nf_tables_offload.c
@@ -103,10 +103,11 @@ void nft_offload_update_dependency(struct nft_offload_ctx *ctx,
 }
 
 static void nft_flow_offload_common_init(struct flow_cls_common_offload *common,
-                                         __be16 proto,
-                                        struct netlink_ext_ack *extack)
+                                         __be16 proto, int priority,
+                                         struct netlink_ext_ack *extack)
 {
         common->protocol = proto;
+        common->prio = priority;
         common->extack = extack;
 }
 
@@ -124,6 +125,15 @@ static int nft_setup_cb_call(struct nft_base_chain *basechain,
         return 0;
 }
 
+int nft_chain_offload_priority(struct nft_base_chain *basechain)
+{
+        if (basechain->ops.priority <= 0 ||
+            basechain->ops.priority > USHRT_MAX)
+                return -1;
+
+        return 0;
+}
+
 static int nft_flow_offload_rule(struct nft_trans *trans,
                                  enum flow_cls_command command)
 {
@@ -142,7 +152,8 @@ static int nft_flow_offload_rule(struct nft_trans *trans,
         if (flow)
                 proto = flow->proto;
 
-        nft_flow_offload_common_init(&cls_flow.common, proto, &extack);
+        nft_flow_offload_common_init(&cls_flow.common, proto,
+                                     basechain->ops.priority, &extack);
         cls_flow.command = command;
         cls_flow.cookie = (unsigned long) rule;
         if (flow)
diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c
index aa5f571d4361..01705ad74a9a 100644
--- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c
@@ -72,11 +72,11 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,
 {
         struct nft_flow_offload *priv = nft_expr_priv(expr);
         struct nf_flowtable *flowtable = &priv->flowtable->data;
+        struct tcphdr _tcph, *tcph = NULL;
         enum ip_conntrack_info ctinfo;
         struct nf_flow_route route;
         struct flow_offload *flow;
         enum ip_conntrack_dir dir;
-        bool is_tcp = false;
         struct nf_conn *ct;
         int ret;
 
@@ -89,7 +89,10 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,
 
         switch (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum) {
         case IPPROTO_TCP:
-                is_tcp = true;
+                tcph = skb_header_pointer(pkt->skb, pkt->xt.thoff,
+                                          sizeof(_tcph), &_tcph);
+                if (unlikely(!tcph || tcph->fin || tcph->rst))
+                        goto out;
                 break;
         case IPPROTO_UDP:
                 break;
@@ -115,7 +118,7 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,
         if (!flow)
                 goto err_flow_alloc;
 
-        if (is_tcp) {
+        if (tcph) {
                 ct->proto.tcp.seen[0].flags |= IP_CT_TCP_FLAG_BE_LIBERAL;
                 ct->proto.tcp.seen[1].flags |= IP_CT_TCP_FLAG_BE_LIBERAL;
         }
@@ -146,6 +149,11 @@ static int nft_flow_offload_validate(const struct nft_ctx *ctx,
         return nft_chain_validate_hooks(ctx->chain, hook_mask);
 }
 
+static const struct nla_policy nft_flow_offload_policy[NFTA_FLOW_MAX + 1] = {
+        [NFTA_FLOW_TABLE_NAME]  = { .type = NLA_STRING,
+                                    .len = NFT_NAME_MAXLEN - 1 },
+};
+
 static int nft_flow_offload_init(const struct nft_ctx *ctx,
                                  const struct nft_expr *expr,
                                  const struct nlattr * const tb[])
@@ -204,6 +212,7 @@ static const struct nft_expr_ops nft_flow_offload_ops = {
 static struct nft_expr_type nft_flow_offload_type __read_mostly = {
         .name           = "flow_offload",
         .ops            = &nft_flow_offload_ops,
+        .policy         = nft_flow_offload_policy,
         .maxattr        = NFTA_FLOW_MAX,
         .owner          = THIS_MODULE,
 };
diff --git a/net/netfilter/xt_nfacct.c b/net/netfilter/xt_nfacct.c
index d0ab1adf5bff..5aab6df74e0f 100644
--- a/net/netfilter/xt_nfacct.c
+++ b/net/netfilter/xt_nfacct.c
@@ -54,25 +54,39 @@ nfacct_mt_destroy(const struct xt_mtdtor_param *par)
         nfnl_acct_put(info->nfacct);
 }
 
-static struct xt_match nfacct_mt_reg __read_mostly = {
-        .name       = "nfacct",
-        .family     = NFPROTO_UNSPEC,
-        .checkentry = nfacct_mt_checkentry,
-        .match      = nfacct_mt,
-        .destroy    = nfacct_mt_destroy,
-        .matchsize  = sizeof(struct xt_nfacct_match_info),
-        .usersize   = offsetof(struct xt_nfacct_match_info, nfacct),
-        .me         = THIS_MODULE,
+static struct xt_match nfacct_mt_reg[] __read_mostly = {
+        {
+                .name       = "nfacct",
+                .revision   = 0,
+                .family     = NFPROTO_UNSPEC,
+                .checkentry = nfacct_mt_checkentry,
+                .match      = nfacct_mt,
+                .destroy    = nfacct_mt_destroy,
+                .matchsize  = sizeof(struct xt_nfacct_match_info),
+                .usersize   = offsetof(struct xt_nfacct_match_info, nfacct),
+                .me         = THIS_MODULE,
+        },
+        {
+                .name       = "nfacct",
+                .revision   = 1,
+                .family     = NFPROTO_UNSPEC,
+                .checkentry = nfacct_mt_checkentry,
+                .match      = nfacct_mt,
+                .destroy    = nfacct_mt_destroy,
+                .matchsize  = sizeof(struct xt_nfacct_match_info_v1),
+                .usersize   = offsetof(struct xt_nfacct_match_info_v1, nfacct),
+                .me         = THIS_MODULE,
+        },
 };
 
 static int __init nfacct_mt_init(void)
 {
-        return xt_register_match(&nfacct_mt_reg);
+        return xt_register_matches(nfacct_mt_reg, ARRAY_SIZE(nfacct_mt_reg));
 }
 
 static void __exit nfacct_mt_exit(void)
 {
-        xt_unregister_match(&nfacct_mt_reg);
+        xt_unregister_matches(nfacct_mt_reg, ARRAY_SIZE(nfacct_mt_reg));
 }
 
 module_init(nfacct_mt_init);
diff --git a/net/netfilter/xt_physdev.c b/net/netfilter/xt_physdev.c
index ead7c6022208..b92b22ce8abd 100644
--- a/net/netfilter/xt_physdev.c
+++ b/net/netfilter/xt_physdev.c
@@ -101,11 +101,9 @@ static int physdev_mt_check(const struct xt_mtchk_param *par)
         if (info->bitmask & (XT_PHYSDEV_OP_OUT | XT_PHYSDEV_OP_ISOUT) &&
             (!(info->bitmask & XT_PHYSDEV_OP_BRIDGED) ||
              info->invert & XT_PHYSDEV_OP_BRIDGED) &&
-            par->hook_mask & ((1 << NF_INET_LOCAL_OUT) |
-            (1 << NF_INET_FORWARD) | (1 << NF_INET_POST_ROUTING))) {
+            par->hook_mask & (1 << NF_INET_LOCAL_OUT)) {
                 pr_info_ratelimited("--physdev-out and --physdev-is-out only supported in the FORWARD and POSTROUTING chains with bridged traffic\n");
-                if (par->hook_mask & (1 << NF_INET_LOCAL_OUT))
-                        return -EINVAL;
+                return -EINVAL;
         }
 
         if (!brnf_probed) {
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 848c6eb55064..05249eb45082 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -67,6 +67,7 @@ struct ovs_conntrack_info {
         struct md_mark mark;
         struct md_labels labels;
         char timeout[CTNL_TIMEOUT_NAME_MAX];
+        struct nf_ct_timeout *nf_ct_timeout;
 #if IS_ENABLED(CONFIG_NF_NAT)
         struct nf_nat_range2 range;  /* Only present for SRC NAT and DST NAT. */
 #endif
@@ -524,6 +525,11 @@ static int handle_fragments(struct net *net, struct sw_flow_key *key,
                 return -EPFNOSUPPORT;
         }
 
+        /* The key extracted from the fragment that completed this datagram
+         * likely didn't have an L4 header, so regenerate it.
+         */
+        ovs_flow_key_update_l3l4(skb, key);
+
         key->ip.frag = OVS_FRAG_TYPE_NONE;
         skb_clear_hash(skb);
         skb->ignore_df = 1;
@@ -697,6 +703,14 @@ static bool skb_nfct_cached(struct net *net,
                 if (help && rcu_access_pointer(help->helper) != info->helper)
                         return false;
         }
+        if (info->nf_ct_timeout) {
+                struct nf_conn_timeout *timeout_ext;
+
+                timeout_ext = nf_ct_timeout_find(ct);
+                if (!timeout_ext || info->nf_ct_timeout !=
+                    rcu_dereference(timeout_ext->timeout))
+                        return false;
+        }
         /* Force conntrack entry direction to the current packet? */
         if (info->force && CTINFO2DIR(ctinfo) != IP_CT_DIR_ORIGINAL) {
                 /* Delete the conntrack entry if confirmed, else just release
@@ -1565,7 +1579,7 @@ static int parse_ct(const struct nlattr *attr, struct ovs_conntrack_info *info,
                 case OVS_CT_ATTR_TIMEOUT:
                         memcpy(info->timeout, nla_data(a), nla_len(a));
                         if (!memchr(info->timeout, '\0', nla_len(a))) {
-                                OVS_NLERR(log, "Invalid conntrack helper");
+                                OVS_NLERR(log, "Invalid conntrack timeout");
                                 return -EINVAL;
                         }
                         break;
@@ -1657,6 +1671,10 @@ int ovs_ct_copy_action(struct net *net, const struct nlattr *attr,
                                       ct_info.timeout))
                         pr_info_ratelimited("Failed to associated timeout "
                                             "policy `%s'\n", ct_info.timeout);
+                else
+                        ct_info.nf_ct_timeout = rcu_dereference(
+                                nf_ct_timeout_find(ct_info.ct)->timeout);
+
         }
 
         if (helper) {
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index bc89e16e0505..9d81d2c7bf82 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -523,78 +523,15 @@ static int parse_nsh(struct sk_buff *skb, struct sw_flow_key *key)
 }
 
 /**
- * key_extract - extracts a flow key from an Ethernet frame.
+ * key_extract_l3l4 - extracts L3/L4 header information.
  * @skb: sk_buff that contains the frame, with skb->data pointing to the
- * Ethernet header
+ *       L3 header
  * @key: output flow key
  *
- * The caller must ensure that skb->len >= ETH_HLEN.
- *
- * Returns 0 if successful, otherwise a negative errno value.
- *
- * Initializes @skb header fields as follows:
- *
- *    - skb->mac_header: the L2 header.
- *
- *    - skb->network_header: just past the L2 header, or just past the
- *      VLAN header, to the first byte of the L2 payload.
- *
- *    - skb->transport_header: If key->eth.type is ETH_P_IP or ETH_P_IPV6
- *      on output, then just past the IP header, if one is present and
- *      of a correct length, otherwise the same as skb->network_header.
- *      For other key->eth.type values it is left untouched.
- *
- *    - skb->protocol: the type of the data starting at skb->network_header.
- *      Equals to key->eth.type.
  */
-static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
+static int key_extract_l3l4(struct sk_buff *skb, struct sw_flow_key *key)
 {
         int error;
-        struct ethhdr *eth;
-
-        /* Flags are always used as part of stats */
-        key->tp.flags = 0;
-
-        skb_reset_mac_header(skb);
-
-        /* Link layer. */
-        clear_vlan(key);
-        if (ovs_key_mac_proto(key) == MAC_PROTO_NONE) {
-                if (unlikely(eth_type_vlan(skb->protocol)))
-                        return -EINVAL;
-
-                skb_reset_network_header(skb);
-                key->eth.type = skb->protocol;
-        } else {
-                eth = eth_hdr(skb);
-                ether_addr_copy(key->eth.src, eth->h_source);
-                ether_addr_copy(key->eth.dst, eth->h_dest);
-
-                __skb_pull(skb, 2 * ETH_ALEN);
-                /* We are going to push all headers that we pull, so no need to
-                * update skb->csum here.
-                */
-
-                if (unlikely(parse_vlan(skb, key)))
-                        return -ENOMEM;
-
-                key->eth.type = parse_ethertype(skb);
-                if (unlikely(key->eth.type == htons(0)))
-                        return -ENOMEM;
-
-                /* Multiple tagged packets need to retain TPID to satisfy
-                 * skb_vlan_pop(), which will later shift the ethertype into
-                 * skb->protocol.
-                 */
-                if (key->eth.cvlan.tci & htons(VLAN_CFI_MASK))
-                        skb->protocol = key->eth.cvlan.tpid;
-                else
-                        skb->protocol = key->eth.type;
-
-                skb_reset_network_header(skb);
-                __skb_push(skb, skb->data - skb_mac_header(skb));
-        }
-        skb_reset_mac_len(skb);
 
         /* Network layer. */
         if (key->eth.type == htons(ETH_P_IP)) {
@@ -623,6 +560,7 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
                 offset = nh->frag_off & htons(IP_OFFSET);
                 if (offset) {
                         key->ip.frag = OVS_FRAG_TYPE_LATER;
+                        memset(&key->tp, 0, sizeof(key->tp));
                         return 0;
                 }
                 if (nh->frag_off & htons(IP_MF) ||
@@ -740,8 +678,10 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
                         return error;
                 }
 
-                if (key->ip.frag == OVS_FRAG_TYPE_LATER)
+                if (key->ip.frag == OVS_FRAG_TYPE_LATER) {
+                        memset(&key->tp, 0, sizeof(key->tp));
                         return 0;
+                }
                 if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP)
                         key->ip.frag = OVS_FRAG_TYPE_FIRST;
 
@@ -788,6 +728,92 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
         return 0;
 }
 
+/**
+ * key_extract - extracts a flow key from an Ethernet frame.
+ * @skb: sk_buff that contains the frame, with skb->data pointing to the
+ * Ethernet header
+ * @key: output flow key
+ *
+ * The caller must ensure that skb->len >= ETH_HLEN.
+ *
+ * Returns 0 if successful, otherwise a negative errno value.
+ *
+ * Initializes @skb header fields as follows:
+ *
+ *    - skb->mac_header: the L2 header.
+ *
+ *    - skb->network_header: just past the L2 header, or just past the
+ *      VLAN header, to the first byte of the L2 payload.
+ *
+ *    - skb->transport_header: If key->eth.type is ETH_P_IP or ETH_P_IPV6
+ *      on output, then just past the IP header, if one is present and
+ *      of a correct length, otherwise the same as skb->network_header.
+ *      For other key->eth.type values it is left untouched.
+ *
+ *    - skb->protocol: the type of the data starting at skb->network_header.
+ *      Equals to key->eth.type.
+ */
+static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
+{
+        struct ethhdr *eth;
+
+        /* Flags are always used as part of stats */
+        key->tp.flags = 0;
+
+        skb_reset_mac_header(skb);
+
+        /* Link layer. */
+        clear_vlan(key);
+        if (ovs_key_mac_proto(key) == MAC_PROTO_NONE) {
+                if (unlikely(eth_type_vlan(skb->protocol)))
+                        return -EINVAL;
+
+                skb_reset_network_header(skb);
+                key->eth.type = skb->protocol;
+        } else {
+                eth = eth_hdr(skb);
+                ether_addr_copy(key->eth.src, eth->h_source);
+                ether_addr_copy(key->eth.dst, eth->h_dest);
+
+                __skb_pull(skb, 2 * ETH_ALEN);
+                /* We are going to push all headers that we pull, so no need to
+                 * update skb->csum here.
+                 */
+
+                if (unlikely(parse_vlan(skb, key)))
+                        return -ENOMEM;
+
+                key->eth.type = parse_ethertype(skb);
+                if (unlikely(key->eth.type == htons(0)))
+                        return -ENOMEM;
+
+                /* Multiple tagged packets need to retain TPID to satisfy
+                 * skb_vlan_pop(), which will later shift the ethertype into
+                 * skb->protocol.
+                 */
+                if (key->eth.cvlan.tci & htons(VLAN_CFI_MASK))
+                        skb->protocol = key->eth.cvlan.tpid;
+                else
+                        skb->protocol = key->eth.type;
+
+                skb_reset_network_header(skb);
+                __skb_push(skb, skb->data - skb_mac_header(skb));
+        }
+
+        skb_reset_mac_len(skb);
+
+        /* Fill out L3/L4 key info, if any */
+        return key_extract_l3l4(skb, key);
+}
+
+/* In the case of conntrack fragment handling it expects L3 headers,
+ * add a helper.
+ */
+int ovs_flow_key_update_l3l4(struct sk_buff *skb, struct sw_flow_key *key)
+{
+        return key_extract_l3l4(skb, key);
+}
+
 int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key)
 {
         int res;
diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h
index a5506e2d4b7a..b830d5ff7af4 100644
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
@@ -270,6 +270,7 @@ void ovs_flow_stats_clear(struct sw_flow *);
 u64 ovs_flow_used_time(unsigned long flow_jiffies);
 
 int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key);
+int ovs_flow_key_update_l3l4(struct sk_buff *skb, struct sw_flow_key *key);
 int ovs_flow_key_extract(const struct ip_tunnel_info *tun_info,
                          struct sk_buff *skb,
                          struct sw_flow_key *key);
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 8d54f3047768..e2742b006d25 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -2618,6 +2618,13 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
 
         mutex_lock(&po->pg_vec_lock);
 
+        /* packet_sendmsg() check on tx_ring.pg_vec was lockless,
+         * we need to confirm it under protection of pg_vec_lock.
+         */
+        if (unlikely(!po->tx_ring.pg_vec)) {
+                err = -EBUSY;
+                goto out;
+        }
         if (likely(saddr == NULL)) {
                 dev     = packet_cached_dev_get(po);
                 proto   = po->num;
diff --git a/net/psample/psample.c b/net/psample/psample.c
index 841f198ea1a8..66e4b61a350d 100644
--- a/net/psample/psample.c
+++ b/net/psample/psample.c
@@ -154,7 +154,7 @@ static void psample_group_destroy(struct psample_group *group)
 {
         psample_group_notify(group, PSAMPLE_CMD_DEL_GROUP);
         list_del(&group->list);
-        kfree(group);
+        kfree_rcu(group, rcu);
 }
 
 static struct psample_group *
diff --git a/net/rds/ib.c b/net/rds/ib.c
index ec05d91aa9a2..45acab2de0cf 100644
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -291,7 +291,7 @@ static int rds_ib_conn_info_visitor(struct rds_connection *conn,
                                     void *buffer)
 {
         struct rds_info_rdma_connection *iinfo = buffer;
-        struct rds_ib_connection *ic;
+        struct rds_ib_connection *ic = conn->c_transport_data;
 
         /* We will only ever look at IB transports */
         if (conn->c_trans != &rds_ib_transport)
@@ -301,15 +301,16 @@ static int rds_ib_conn_info_visitor(struct rds_connection *conn,
 
         iinfo->src_addr = conn->c_laddr.s6_addr32[3];
         iinfo->dst_addr = conn->c_faddr.s6_addr32[3];
-        iinfo->tos = conn->c_tos;
+        if (ic) {
+                iinfo->tos = conn->c_tos;
+                iinfo->sl = ic->i_sl;
+        }
 
         memset(&iinfo->src_gid, 0, sizeof(iinfo->src_gid));
         memset(&iinfo->dst_gid, 0, sizeof(iinfo->dst_gid));
         if (rds_conn_state(conn) == RDS_CONN_UP) {
                 struct rds_ib_device *rds_ibdev;
 
-                ic = conn->c_transport_data;
-
                 rdma_read_gids(ic->i_cm_id, (union ib_gid *)&iinfo->src_gid,
                                (union ib_gid *)&iinfo->dst_gid);
 
@@ -329,7 +330,7 @@ static int rds6_ib_conn_info_visitor(struct rds_connection *conn,
                                      void *buffer)
 {
         struct rds6_info_rdma_connection *iinfo6 = buffer;
-        struct rds_ib_connection *ic;
+        struct rds_ib_connection *ic = conn->c_transport_data;
 
         /* We will only ever look at IB transports */
         if (conn->c_trans != &rds_ib_transport)
@@ -337,6 +338,10 @@ static int rds6_ib_conn_info_visitor(struct rds_connection *conn,
 
         iinfo6->src_addr = conn->c_laddr;
         iinfo6->dst_addr = conn->c_faddr;
+        if (ic) {
+                iinfo6->tos = conn->c_tos;
+                iinfo6->sl = ic->i_sl;
+        }
 
         memset(&iinfo6->src_gid, 0, sizeof(iinfo6->src_gid));
         memset(&iinfo6->dst_gid, 0, sizeof(iinfo6->dst_gid));
@@ -344,7 +349,6 @@ static int rds6_ib_conn_info_visitor(struct rds_connection *conn,
         if (rds_conn_state(conn) == RDS_CONN_UP) {
                 struct rds_ib_device *rds_ibdev;
 
-                ic = conn->c_transport_data;
                 rdma_read_gids(ic->i_cm_id, (union ib_gid *)&iinfo6->src_gid,
                                (union ib_gid *)&iinfo6->dst_gid);
                 rds_ibdev = ic->rds_ibdev;
diff --git a/net/rds/ib.h b/net/rds/ib.h
index 303c6ee8bdb7..f2b558e8b5ea 100644
--- a/net/rds/ib.h
+++ b/net/rds/ib.h
@@ -220,6 +220,7 @@ struct rds_ib_connection {
         /* Send/Recv vectors */
         int                     i_scq_vector;
         int                     i_rcq_vector;
+        u8                      i_sl;
 };
 
 /* This assumes that atomic_t is at least 32 bits */
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index fddaa09f7b0d..233f1368162b 100644
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -152,6 +152,9 @@ void rds_ib_cm_connect_complete(struct rds_connection *conn, struct rdma_cm_even
                   RDS_PROTOCOL_MINOR(conn->c_version),
                   ic->i_flowctl ? ", flow control" : "");
 
+        /* receive sl from the peer */
+        ic->i_sl = ic->i_cm_id->route.path_rec->sl;
+
         atomic_set(&ic->i_cq_quiesce, 0);
 
         /* Init rings and fill recv. this needs to wait until protocol
diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c
index 9986d6065c4d..5f741e51b4ba 100644
--- a/net/rds/rdma_transport.c
+++ b/net/rds/rdma_transport.c
@@ -43,6 +43,9 @@ static struct rdma_cm_id *rds_rdma_listen_id;
 static struct rdma_cm_id *rds6_rdma_listen_id;
 #endif
 
+/* Per IB specification 7.7.3, service level is a 4-bit field. */
+#define TOS_TO_SL(tos)          ((tos) & 0xF)
+
 static int rds_rdma_cm_event_handler_cmn(struct rdma_cm_id *cm_id,
                                          struct rdma_cm_event *event,
                                          bool isv6)
@@ -97,10 +100,13 @@ static int rds_rdma_cm_event_handler_cmn(struct rdma_cm_id *cm_id,
                         struct rds_ib_connection *ibic;
 
                         ibic = conn->c_transport_data;
-                        if (ibic && ibic->i_cm_id == cm_id)
+                        if (ibic && ibic->i_cm_id == cm_id) {
+                                cm_id->route.path_rec[0].sl =
+                                        TOS_TO_SL(conn->c_tos);
                                 ret = trans->cm_initiate_connect(cm_id, isv6);
-                        else
+                        } else {
                                 rds_conn_drop(conn);
+                        }
                 }
                 break;
 
diff --git a/net/rds/recv.c b/net/rds/recv.c
index 853de4876088..a42ba7fa06d5 100644
--- a/net/rds/recv.c
+++ b/net/rds/recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -811,6 +811,7 @@ void rds6_inc_info_copy(struct rds_incoming *inc,
 
         minfo6.seq = be64_to_cpu(inc->i_hdr.h_sequence);
         minfo6.len = be32_to_cpu(inc->i_hdr.h_len);
+        minfo6.tos = inc->i_conn->c_tos;
 
         if (flip) {
                 minfo6.laddr = *daddr;
@@ -824,6 +825,8 @@ void rds6_inc_info_copy(struct rds_incoming *inc,
                 minfo6.fport = inc->i_hdr.h_dport;
         }
 
+        minfo6.flags = 0;
+
         rds_info_copy(iter, &minfo6, sizeof(minfo6));
 }
 #endif
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index d09eaf153544..d72ddb67bb74 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -193,7 +193,7 @@ static int rxrpc_bind(struct socket *sock, struct sockaddr *saddr, int len)
 
 service_in_use:
         write_unlock(&local->services_lock);
-        rxrpc_put_local(local);
+        rxrpc_unuse_local(local);
         ret = -EADDRINUSE;
 error_unlock:
         release_sock(&rx->sk);
@@ -402,7 +402,7 @@ EXPORT_SYMBOL(rxrpc_kernel_check_life);
  */
 void rxrpc_kernel_probe_life(struct socket *sock, struct rxrpc_call *call)
 {
-        rxrpc_propose_ACK(call, RXRPC_ACK_PING, 0, 0, true, false,
+        rxrpc_propose_ACK(call, RXRPC_ACK_PING, 0, true, false,
                           rxrpc_propose_ack_ping_for_check_life);
         rxrpc_send_ack_packet(call, true, NULL);
 }
@@ -862,7 +862,6 @@ static void rxrpc_sock_destructor(struct sock *sk)
 static int rxrpc_release_sock(struct sock *sk)
 {
         struct rxrpc_sock *rx = rxrpc_sk(sk);
-        struct rxrpc_net *rxnet = rxrpc_net(sock_net(&rx->sk));
 
         _enter("%p{%d,%d}", sk, sk->sk_state, refcount_read(&sk->sk_refcnt));
 
@@ -898,10 +897,8 @@ static int rxrpc_release_sock(struct sock *sk)
         rxrpc_release_calls_on_socket(rx);
         flush_workqueue(rxrpc_workqueue);
         rxrpc_purge_queue(&sk->sk_receive_queue);
-        rxrpc_queue_work(&rxnet->service_conn_reaper);
-        rxrpc_queue_work(&rxnet->client_conn_reaper);
 
-        rxrpc_put_local(rx->local);
+        rxrpc_unuse_local(rx->local);
         rx->local = NULL;
         key_put(rx->key);
         rx->key = NULL;
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index 822f45386e31..8051dfdcf26d 100644
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -185,11 +185,17 @@ struct rxrpc_host_header {
  * - max 48 bytes (struct sk_buff::cb)
  */
 struct rxrpc_skb_priv {
-        union {
-                u8              nr_jumbo;       /* Number of jumbo subpackets */
-        };
+        atomic_t        nr_ring_pins;           /* Number of rxtx ring pins */
+        u8              nr_subpackets;          /* Number of subpackets */
+        u8              rx_flags;               /* Received packet flags */
+#define RXRPC_SKB_INCL_LAST     0x01            /* - Includes last packet */
+#define RXRPC_SKB_TX_BUFFER     0x02            /* - Is transmit buffer */
         union {
                 int             remain;         /* amount of space remaining for next write */
+
+                /* List of requested ACKs on subpackets */
+                unsigned long   rx_req_ack[(RXRPC_MAX_NR_JUMBO + BITS_PER_LONG - 1) /
+                                           BITS_PER_LONG];
         };
 
         struct rxrpc_host_header hdr;           /* RxRPC packet header from this packet */
@@ -254,7 +260,8 @@ struct rxrpc_security {
  */
 struct rxrpc_local {
         struct rcu_head         rcu;
-        atomic_t                usage;
+        atomic_t                active_users;   /* Number of users of the local endpoint */
+        atomic_t                usage;          /* Number of references to the structure */
         struct rxrpc_net        *rxnet;         /* The network ns in which this resides */
         struct list_head        link;
         struct socket           *socket;        /* my UDP socket */
@@ -612,8 +619,7 @@ struct rxrpc_call {
 #define RXRPC_TX_ANNO_LAST      0x04
 #define RXRPC_TX_ANNO_RESENT    0x08
 
-#define RXRPC_RX_ANNO_JUMBO     0x3f            /* Jumbo subpacket number + 1 if not zero */
-#define RXRPC_RX_ANNO_JLAST     0x40            /* Set if last element of a jumbo packet */
+#define RXRPC_RX_ANNO_SUBPACKET 0x3f            /* Subpacket number in jumbogram */
 #define RXRPC_RX_ANNO_VERIFIED  0x80            /* Set if verified and decrypted */
         rxrpc_seq_t             tx_hard_ack;    /* Dead slot in buffer; the first transmitted but
                                                  * not hard-ACK'd packet follows this.
@@ -649,7 +655,6 @@ struct rxrpc_call {
 
         /* receive-phase ACK management */
         u8                      ackr_reason;    /* reason to ACK */
-        u16                     ackr_skew;      /* skew on packet being ACK'd */
         rxrpc_serial_t          ackr_serial;    /* serial of packet being ACK'd */
         rxrpc_serial_t          ackr_first_seq; /* first sequence number received */
         rxrpc_seq_t             ackr_prev_seq;  /* previous sequence number received */
@@ -743,7 +748,7 @@ int rxrpc_reject_call(struct rxrpc_sock *);
 /*
  * call_event.c
  */
-void rxrpc_propose_ACK(struct rxrpc_call *, u8, u16, u32, bool, bool,
+void rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool, bool,
                        enum rxrpc_propose_ack_trace);
 void rxrpc_process_call(struct work_struct *);
 
@@ -905,6 +910,7 @@ void rxrpc_disconnect_client_call(struct rxrpc_call *);
 void rxrpc_put_client_conn(struct rxrpc_connection *);
 void rxrpc_discard_expired_client_conns(struct work_struct *);
 void rxrpc_destroy_all_client_connections(struct rxrpc_net *);
+void rxrpc_clean_up_local_conns(struct rxrpc_local *);
 
 /*
  * conn_event.c
@@ -1002,6 +1008,8 @@ struct rxrpc_local *rxrpc_lookup_local(struct net *, const struct sockaddr_rxrpc
 struct rxrpc_local *rxrpc_get_local(struct rxrpc_local *);
 struct rxrpc_local *rxrpc_get_local_maybe(struct rxrpc_local *);
 void rxrpc_put_local(struct rxrpc_local *);
+struct rxrpc_local *rxrpc_use_local(struct rxrpc_local *);
+void rxrpc_unuse_local(struct rxrpc_local *);
 void rxrpc_queue_local(struct rxrpc_local *);
 void rxrpc_destroy_all_locals(struct rxrpc_net *);
 
@@ -1103,6 +1111,7 @@ void rxrpc_kernel_data_consumed(struct rxrpc_call *, struct sk_buff *);
 void rxrpc_packet_destructor(struct sk_buff *);
 void rxrpc_new_skb(struct sk_buff *, enum rxrpc_skb_trace);
 void rxrpc_see_skb(struct sk_buff *, enum rxrpc_skb_trace);
+void rxrpc_eaten_skb(struct sk_buff *, enum rxrpc_skb_trace);
 void rxrpc_get_skb(struct sk_buff *, enum rxrpc_skb_trace);
 void rxrpc_free_skb(struct sk_buff *, enum rxrpc_skb_trace);
 void rxrpc_purge_queue(struct sk_buff_head *);
diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c
index bc2adeb3acb9..cedbbb3a7c2e 100644
--- a/net/rxrpc/call_event.c
+++ b/net/rxrpc/call_event.c
@@ -43,8 +43,7 @@ static void rxrpc_propose_ping(struct rxrpc_call *call,
  * propose an ACK be sent
  */
 static void __rxrpc_propose_ACK(struct rxrpc_call *call, u8 ack_reason,
-                                u16 skew, u32 serial, bool immediate,
-                                bool background,
+                                u32 serial, bool immediate, bool background,
                                 enum rxrpc_propose_ack_trace why)
 {
         enum rxrpc_propose_ack_outcome outcome = rxrpc_propose_ack_use;
@@ -69,14 +68,12 @@ static void __rxrpc_propose_ACK(struct rxrpc_call *call, u8 ack_reason,
                 if (RXRPC_ACK_UPDATEABLE & (1 << ack_reason)) {
                         outcome = rxrpc_propose_ack_update;
                         call->ackr_serial = serial;
-                        call->ackr_skew = skew;
                 }
                 if (!immediate)
                         goto trace;
         } else if (prior > rxrpc_ack_priority[call->ackr_reason]) {
                 call->ackr_reason = ack_reason;
                 call->ackr_serial = serial;
-                call->ackr_skew = skew;
         } else {
                 outcome = rxrpc_propose_ack_subsume;
         }
@@ -137,11 +134,11 @@ trace:
  * propose an ACK be sent, locking the call structure
  */
 void rxrpc_propose_ACK(struct rxrpc_call *call, u8 ack_reason,
-                       u16 skew, u32 serial, bool immediate, bool background,
+                       u32 serial, bool immediate, bool background,
                        enum rxrpc_propose_ack_trace why)
 {
         spin_lock_bh(&call->lock);
-        __rxrpc_propose_ACK(call, ack_reason, skew, serial,
+        __rxrpc_propose_ACK(call, ack_reason, serial,
                             immediate, background, why);
         spin_unlock_bh(&call->lock);
 }
@@ -202,7 +199,7 @@ static void rxrpc_resend(struct rxrpc_call *call, unsigned long now_j)
                         continue;
 
                 skb = call->rxtx_buffer[ix];
-                rxrpc_see_skb(skb, rxrpc_skb_tx_seen);
+                rxrpc_see_skb(skb, rxrpc_skb_seen);
 
                 if (anno_type == RXRPC_TX_ANNO_UNACK) {
                         if (ktime_after(skb->tstamp, max_age)) {
@@ -239,7 +236,7 @@ static void rxrpc_resend(struct rxrpc_call *call, unsigned long now_j)
                 ack_ts = ktime_sub(now, call->acks_latest_ts);
                 if (ktime_to_ns(ack_ts) < call->peer->rtt)
                         goto out;
-                rxrpc_propose_ACK(call, RXRPC_ACK_PING, 0, 0, true, false,
+                rxrpc_propose_ACK(call, RXRPC_ACK_PING, 0, true, false,
                                   rxrpc_propose_ack_ping_for_lost_ack);
                 rxrpc_send_ack_packet(call, true, NULL);
                 goto out;
@@ -258,18 +255,18 @@ static void rxrpc_resend(struct rxrpc_call *call, unsigned long now_j)
                         continue;
 
                 skb = call->rxtx_buffer[ix];
-                rxrpc_get_skb(skb, rxrpc_skb_tx_got);
+                rxrpc_get_skb(skb, rxrpc_skb_got);
                 spin_unlock_bh(&call->lock);
 
                 if (rxrpc_send_data_packet(call, skb, true) < 0) {
-                        rxrpc_free_skb(skb, rxrpc_skb_tx_freed);
+                        rxrpc_free_skb(skb, rxrpc_skb_freed);
                         return;
                 }
 
                 if (rxrpc_is_client_call(call))
                         rxrpc_expose_client_call(call);
 
-                rxrpc_free_skb(skb, rxrpc_skb_tx_freed);
+                rxrpc_free_skb(skb, rxrpc_skb_freed);
                 spin_lock_bh(&call->lock);
 
                 /* We need to clear the retransmit state, but there are two
@@ -372,7 +369,7 @@ recheck_state:
         if (time_after_eq(now, t)) {
                 trace_rxrpc_timer(call, rxrpc_timer_exp_keepalive, now);
                 cmpxchg(&call->keepalive_at, t, now + MAX_JIFFY_OFFSET);
-                rxrpc_propose_ACK(call, RXRPC_ACK_PING, 0, 0, true, true,
+                rxrpc_propose_ACK(call, RXRPC_ACK_PING, 0, true, true,
                                   rxrpc_propose_ack_ping_for_keepalive);
                 set_bit(RXRPC_CALL_EV_PING, &call->events);
         }
@@ -407,7 +404,7 @@ recheck_state:
         send_ack = NULL;
         if (test_and_clear_bit(RXRPC_CALL_EV_ACK_LOST, &call->events)) {
                 call->acks_lost_top = call->tx_top;
-                rxrpc_propose_ACK(call, RXRPC_ACK_PING, 0, 0, true, false,
+                rxrpc_propose_ACK(call, RXRPC_ACK_PING, 0, true, false,
                                   rxrpc_propose_ack_ping_for_lost_ack);
                 send_ack = &call->acks_lost_ping;
         }
diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c
index 217b12be9e08..014548c259ce 100644
--- a/net/rxrpc/call_object.c
+++ b/net/rxrpc/call_object.c
@@ -422,6 +422,19 @@ void rxrpc_get_call(struct rxrpc_call *call, enum rxrpc_call_trace op)
 }
 
 /*
+ * Clean up the RxTx skb ring.
+ */
+static void rxrpc_cleanup_ring(struct rxrpc_call *call)
+{
+        int i;
+
+        for (i = 0; i < RXRPC_RXTX_BUFF_SIZE; i++) {
+                rxrpc_free_skb(call->rxtx_buffer[i], rxrpc_skb_cleaned);
+                call->rxtx_buffer[i] = NULL;
+        }
+}
+
+/*
  * Detach a call from its owning socket.
  */
 void rxrpc_release_call(struct rxrpc_sock *rx, struct rxrpc_call *call)
@@ -429,7 +442,6 @@ void rxrpc_release_call(struct rxrpc_sock *rx, struct rxrpc_call *call)
         const void *here = __builtin_return_address(0);
         struct rxrpc_connection *conn = call->conn;
         bool put = false;
-        int i;
 
         _enter("{%d,%d}", call->debug_id, atomic_read(&call->usage));
 
@@ -479,13 +491,7 @@ void rxrpc_release_call(struct rxrpc_sock *rx, struct rxrpc_call *call)
         if (conn)
                 rxrpc_disconnect_call(call);
 
-        for (i = 0; i < RXRPC_RXTX_BUFF_SIZE; i++) {
-                rxrpc_free_skb(call->rxtx_buffer[i],
-                               (call->tx_phase ? rxrpc_skb_tx_cleaned :
-                                rxrpc_skb_rx_cleaned));
-                call->rxtx_buffer[i] = NULL;
-        }
-
+        rxrpc_cleanup_ring(call);
         _leave("");
 }
 
@@ -568,8 +574,6 @@ static void rxrpc_rcu_destroy_call(struct rcu_head *rcu)
  */
 void rxrpc_cleanup_call(struct rxrpc_call *call)
 {
-        int i;
-
         _net("DESTROY CALL %d", call->debug_id);
 
         memset(&call->sock_node, 0xcd, sizeof(call->sock_node));
@@ -580,13 +584,8 @@ void rxrpc_cleanup_call(struct rxrpc_call *call)
         ASSERT(test_bit(RXRPC_CALL_RELEASED, &call->flags));
         ASSERTCMP(call->conn, ==, NULL);
 
-        /* Clean up the Rx/Tx buffer */
-        for (i = 0; i < RXRPC_RXTX_BUFF_SIZE; i++)
-                rxrpc_free_skb(call->rxtx_buffer[i],
-                               (call->tx_phase ? rxrpc_skb_tx_cleaned :
-                                rxrpc_skb_rx_cleaned));
-
-        rxrpc_free_skb(call->tx_pending, rxrpc_skb_tx_cleaned);
+        rxrpc_cleanup_ring(call);
+        rxrpc_free_skb(call->tx_pending, rxrpc_skb_cleaned);
 
         call_rcu(&call->rcu, rxrpc_rcu_destroy_call);
 }
diff --git a/net/rxrpc/conn_client.c b/net/rxrpc/conn_client.c
index aea82f909c60..3f1da1b49f69 100644
--- a/net/rxrpc/conn_client.c
+++ b/net/rxrpc/conn_client.c
@@ -1162,3 +1162,47 @@ void rxrpc_destroy_all_client_connections(struct rxrpc_net *rxnet)
 
         _leave("");
 }
+
+/*
+ * Clean up the client connections on a local endpoint.
+ */
+void rxrpc_clean_up_local_conns(struct rxrpc_local *local)
+{
+        struct rxrpc_connection *conn, *tmp;
+        struct rxrpc_net *rxnet = local->rxnet;
+        unsigned int nr_active;
+        LIST_HEAD(graveyard);
+
+        _enter("");
+
+        spin_lock(&rxnet->client_conn_cache_lock);
+        nr_active = rxnet->nr_active_client_conns;
+
+        list_for_each_entry_safe(conn, tmp, &rxnet->idle_client_conns,
+                                 cache_link) {
+                if (conn->params.local == local) {
+                        ASSERTCMP(conn->cache_state, ==, RXRPC_CONN_CLIENT_IDLE);
+
+                        trace_rxrpc_client(conn, -1, rxrpc_client_discard);
+                        if (!test_and_clear_bit(RXRPC_CONN_EXPOSED, &conn->flags))
+                                BUG();
+                        conn->cache_state = RXRPC_CONN_CLIENT_INACTIVE;
+                        list_move(&conn->cache_link, &graveyard);
+                        nr_active--;
+                }
+        }
+
+        rxnet->nr_active_client_conns = nr_active;
+        spin_unlock(&rxnet->client_conn_cache_lock);
+        ASSERTCMP(nr_active, >=, 0);
+
+        while (!list_empty(&graveyard)) {
+                conn = list_entry(graveyard.next,
+                                  struct rxrpc_connection, cache_link);
+                list_del_init(&conn->cache_link);
+
+                rxrpc_put_connection(conn);
+        }
+
+        _leave(" [culled]");
+}
diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c
index df6624c140be..a1ceef4f5cd0 100644
--- a/net/rxrpc/conn_event.c
+++ b/net/rxrpc/conn_event.c
@@ -472,7 +472,7 @@ void rxrpc_process_connection(struct work_struct *work)
         /* go through the conn-level event packets, releasing the ref on this
          * connection that each one has when we've finished with it */
         while ((skb = skb_dequeue(&conn->rx_queue))) {
-                rxrpc_see_skb(skb, rxrpc_skb_rx_seen);
+                rxrpc_see_skb(skb, rxrpc_skb_seen);
                 ret = rxrpc_process_event(conn, skb, &abort_code);
                 switch (ret) {
                 case -EPROTO:
@@ -484,7 +484,7 @@ void rxrpc_process_connection(struct work_struct *work)
                         goto requeue_and_leave;
                 case -ECONNABORTED:
                 default:
-                        rxrpc_free_skb(skb, rxrpc_skb_rx_freed);
+                        rxrpc_free_skb(skb, rxrpc_skb_freed);
                         break;
                 }
         }
@@ -501,6 +501,6 @@ requeue_and_leave:
 protocol_error:
         if (rxrpc_abort_connection(conn, ret, abort_code) < 0)
                 goto requeue_and_leave;
-        rxrpc_free_skb(skb, rxrpc_skb_rx_freed);
+        rxrpc_free_skb(skb, rxrpc_skb_freed);
         goto out;
 }
diff --git a/net/rxrpc/conn_object.c b/net/rxrpc/conn_object.c
index 434ef392212b..ed05b6922132 100644
--- a/net/rxrpc/conn_object.c
+++ b/net/rxrpc/conn_object.c
@@ -398,7 +398,7 @@ void rxrpc_service_connection_reaper(struct work_struct *work)
                 if (conn->state == RXRPC_CONN_SERVICE_PREALLOC)
                         continue;
 
-                if (rxnet->live) {
+                if (rxnet->live && !conn->params.local->dead) {
                         idle_timestamp = READ_ONCE(conn->idle_timestamp);
                         expire_at = idle_timestamp + rxrpc_connection_expiry * HZ;
                         if (conn->params.local->service_closed)
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c
index 5bd6f1546e5c..d122c53c8697 100644
--- a/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
@@ -196,15 +196,14 @@ send_extra_data:
  * Ping the other end to fill our RTT cache and to retrieve the rwind
  * and MTU parameters.
  */
-static void rxrpc_send_ping(struct rxrpc_call *call, struct sk_buff *skb,
-                            int skew)
+static void rxrpc_send_ping(struct rxrpc_call *call, struct sk_buff *skb)
 {
         struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
         ktime_t now = skb->tstamp;
 
         if (call->peer->rtt_usage < 3 ||
             ktime_before(ktime_add_ms(call->peer->rtt_last_req, 1000), now))
-                rxrpc_propose_ACK(call, RXRPC_ACK_PING, skew, sp->hdr.serial,
+                rxrpc_propose_ACK(call, RXRPC_ACK_PING, sp->hdr.serial,
                                   true, true,
                                   rxrpc_propose_ack_ping_for_params);
 }
@@ -234,7 +233,7 @@ static bool rxrpc_rotate_tx_window(struct rxrpc_call *call, rxrpc_seq_t to,
                 ix = call->tx_hard_ack & RXRPC_RXTX_BUFF_MASK;
                 skb = call->rxtx_buffer[ix];
                 annotation = call->rxtx_annotations[ix];
-                rxrpc_see_skb(skb, rxrpc_skb_tx_rotated);
+                rxrpc_see_skb(skb, rxrpc_skb_rotated);
                 call->rxtx_buffer[ix] = NULL;
                 call->rxtx_annotations[ix] = 0;
                 skb->next = list;
@@ -259,7 +258,7 @@ static bool rxrpc_rotate_tx_window(struct rxrpc_call *call, rxrpc_seq_t to,
                 skb = list;
                 list = skb->next;
                 skb_mark_not_on_list(skb);
-                rxrpc_free_skb(skb, rxrpc_skb_tx_freed);
+                rxrpc_free_skb(skb, rxrpc_skb_freed);
         }
 
         return rot_last;
@@ -348,7 +347,7 @@ static bool rxrpc_receiving_reply(struct rxrpc_call *call)
 }
 
 /*
- * Scan a jumbo packet to validate its structure and to work out how many
+ * Scan a data packet to validate its structure and to work out how many
  * subpackets it contains.
  *
  * A jumbo packet is a collection of consecutive packets glued together with
@@ -359,16 +358,21 @@ static bool rxrpc_receiving_reply(struct rxrpc_call *call)
  * the last are RXRPC_JUMBO_DATALEN in size.  The last subpacket may be of any
  * size.
  */
-static bool rxrpc_validate_jumbo(struct sk_buff *skb)
+static bool rxrpc_validate_data(struct sk_buff *skb)
 {
         struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
         unsigned int offset = sizeof(struct rxrpc_wire_header);
         unsigned int len = skb->len;
-        int nr_jumbo = 1;
         u8 flags = sp->hdr.flags;
 
-        do {
-                nr_jumbo++;
+        for (;;) {
+                if (flags & RXRPC_REQUEST_ACK)
+                        __set_bit(sp->nr_subpackets, sp->rx_req_ack);
+                sp->nr_subpackets++;
+
+                if (!(flags & RXRPC_JUMBO_PACKET))
+                        break;
+
                 if (len - offset < RXRPC_JUMBO_SUBPKTLEN)
                         goto protocol_error;
                 if (flags & RXRPC_LAST_PACKET)
@@ -377,9 +381,10 @@ static bool rxrpc_validate_jumbo(struct sk_buff *skb)
                 if (skb_copy_bits(skb, offset, &flags, 1) < 0)
                         goto protocol_error;
                 offset += sizeof(struct rxrpc_jumbo_header);
-        } while (flags & RXRPC_JUMBO_PACKET);
+        }
 
-        sp->nr_jumbo = nr_jumbo;
+        if (flags & RXRPC_LAST_PACKET)
+                sp->rx_flags |= RXRPC_SKB_INCL_LAST;
         return true;
 
 protocol_error:
@@ -400,10 +405,10 @@ protocol_error:
  * (that information is encoded in the ACK packet).
  */
 static void rxrpc_input_dup_data(struct rxrpc_call *call, rxrpc_seq_t seq,
-                                 u8 annotation, bool *_jumbo_bad)
+                                 bool is_jumbo, bool *_jumbo_bad)
 {
         /* Discard normal packets that are duplicates. */
-        if (annotation == 0)
+        if (is_jumbo)
                 return;
 
         /* Skip jumbo subpackets that are duplicates.  When we've had three or
@@ -417,30 +422,30 @@ static void rxrpc_input_dup_data(struct rxrpc_call *call, rxrpc_seq_t seq,
 }
 
 /*
- * Process a DATA packet, adding the packet to the Rx ring.
+ * Process a DATA packet, adding the packet to the Rx ring.  The caller's
+ * packet ref must be passed on or discarded.
  */
-static void rxrpc_input_data(struct rxrpc_call *call, struct sk_buff *skb,
-                             u16 skew)
+static void rxrpc_input_data(struct rxrpc_call *call, struct sk_buff *skb)
 {
         struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
         enum rxrpc_call_state state;
-        unsigned int offset = sizeof(struct rxrpc_wire_header);
-        unsigned int ix;
+        unsigned int j;
         rxrpc_serial_t serial = sp->hdr.serial, ack_serial = 0;
-        rxrpc_seq_t seq = sp->hdr.seq, hard_ack;
-        bool immediate_ack = false, jumbo_bad = false, queued;
-        u16 len;
-        u8 ack = 0, flags, annotation = 0;
+        rxrpc_seq_t seq0 = sp->hdr.seq, hard_ack;
+        bool immediate_ack = false, jumbo_bad = false;
+        u8 ack = 0;
 
         _enter("{%u,%u},{%u,%u}",
-               call->rx_hard_ack, call->rx_top, skb->len, seq);
+               call->rx_hard_ack, call->rx_top, skb->len, seq0);
 
-        _proto("Rx DATA %%%u { #%u f=%02x }",
-               sp->hdr.serial, seq, sp->hdr.flags);
+        _proto("Rx DATA %%%u { #%u f=%02x n=%u }",
+               sp->hdr.serial, seq0, sp->hdr.flags, sp->nr_subpackets);
 
         state = READ_ONCE(call->state);
-        if (state >= RXRPC_CALL_COMPLETE)
+        if (state >= RXRPC_CALL_COMPLETE) {
+                rxrpc_free_skb(skb, rxrpc_skb_freed);
                 return;
+        }
 
         if (call->state == RXRPC_CALL_SERVER_RECV_REQUEST) {
                 unsigned long timo = READ_ONCE(call->next_req_timo);
@@ -465,156 +470,157 @@ static void rxrpc_input_data(struct rxrpc_call *call, struct sk_buff *skb,
             !rxrpc_receiving_reply(call))
                 goto unlock;
 
-        call->ackr_prev_seq = seq;
-
+        call->ackr_prev_seq = seq0;
         hard_ack = READ_ONCE(call->rx_hard_ack);
-        if (after(seq, hard_ack + call->rx_winsize)) {
-                ack = RXRPC_ACK_EXCEEDS_WINDOW;
-                ack_serial = serial;
-                goto ack;
-        }
 
-        flags = sp->hdr.flags;
-        if (flags & RXRPC_JUMBO_PACKET) {
+        if (sp->nr_subpackets > 1) {
                 if (call->nr_jumbo_bad > 3) {
                         ack = RXRPC_ACK_NOSPACE;
                         ack_serial = serial;
                         goto ack;
                 }
-                annotation = 1;
         }
 
-next_subpacket:
-        queued = false;
-        ix = seq & RXRPC_RXTX_BUFF_MASK;
-        len = skb->len;
-        if (flags & RXRPC_JUMBO_PACKET)
-                len = RXRPC_JUMBO_DATALEN;
-
-        if (flags & RXRPC_LAST_PACKET) {
-                if (test_bit(RXRPC_CALL_RX_LAST, &call->flags) &&
-                    seq != call->rx_top) {
-                        rxrpc_proto_abort("LSN", call, seq);
-                        goto unlock;
-                }
-        } else {
-                if (test_bit(RXRPC_CALL_RX_LAST, &call->flags) &&
-                    after_eq(seq, call->rx_top)) {
-                        rxrpc_proto_abort("LSA", call, seq);
-                        goto unlock;
+        for (j = 0; j < sp->nr_subpackets; j++) {
+                rxrpc_serial_t serial = sp->hdr.serial + j;
+                rxrpc_seq_t seq = seq0 + j;
+                unsigned int ix = seq & RXRPC_RXTX_BUFF_MASK;
+                bool terminal = (j == sp->nr_subpackets - 1);
+                bool last = terminal && (sp->rx_flags & RXRPC_SKB_INCL_LAST);
+                u8 flags, annotation = j;
+
+                _proto("Rx DATA+%u %%%u { #%x t=%u l=%u }",
+                     j, serial, seq, terminal, last);
+
+                if (last) {
+                        if (test_bit(RXRPC_CALL_RX_LAST, &call->flags) &&
+                            seq != call->rx_top) {
+                                rxrpc_proto_abort("LSN", call, seq);
+                                goto unlock;
+                        }
+                } else {
+                        if (test_bit(RXRPC_CALL_RX_LAST, &call->flags) &&
+                            after_eq(seq, call->rx_top)) {
+                                rxrpc_proto_abort("LSA", call, seq);
+                                goto unlock;
+                        }
                 }
-        }
-
-        trace_rxrpc_rx_data(call->debug_id, seq, serial, flags, annotation);
-        if (before_eq(seq, hard_ack)) {
-                ack = RXRPC_ACK_DUPLICATE;
-                ack_serial = serial;
-                goto skip;
-        }
 
-        if (flags & RXRPC_REQUEST_ACK && !ack) {
-                ack = RXRPC_ACK_REQUESTED;
-                ack_serial = serial;
-        }
+                flags = 0;
+                if (last)
+                        flags |= RXRPC_LAST_PACKET;
+                if (!terminal)
+                        flags |= RXRPC_JUMBO_PACKET;
+                if (test_bit(j, sp->rx_req_ack))
+                        flags |= RXRPC_REQUEST_ACK;
+                trace_rxrpc_rx_data(call->debug_id, seq, serial, flags, annotation);
 
-        if (call->rxtx_buffer[ix]) {
-                rxrpc_input_dup_data(call, seq, annotation, &jumbo_bad);
-                if (ack != RXRPC_ACK_DUPLICATE) {
+                if (before_eq(seq, hard_ack)) {
                         ack = RXRPC_ACK_DUPLICATE;
                         ack_serial = serial;
+                        continue;
                 }
-                immediate_ack = true;
-                goto skip;
-        }
-
-        /* Queue the packet.  We use a couple of memory barriers here as need
-         * to make sure that rx_top is perceived to be set after the buffer
-         * pointer and that the buffer pointer is set after the annotation and
-         * the skb data.
-         *
-         * Barriers against rxrpc_recvmsg_data() and rxrpc_rotate_rx_window()
-         * and also rxrpc_fill_out_ack().
-         */
-        rxrpc_get_skb(skb, rxrpc_skb_rx_got);
-        call->rxtx_annotations[ix] = annotation;
-        smp_wmb();
-        call->rxtx_buffer[ix] = skb;
-        if (after(seq, call->rx_top)) {
-                smp_store_release(&call->rx_top, seq);
-        } else if (before(seq, call->rx_top)) {
-                /* Send an immediate ACK if we fill in a hole */
-                if (!ack) {
-                        ack = RXRPC_ACK_DELAY;
-                        ack_serial = serial;
-                }
-                immediate_ack = true;
-        }
-        if (flags & RXRPC_LAST_PACKET) {
-                set_bit(RXRPC_CALL_RX_LAST, &call->flags);
-                trace_rxrpc_receive(call, rxrpc_receive_queue_last, serial, seq);
-        } else {
-                trace_rxrpc_receive(call, rxrpc_receive_queue, serial, seq);
-        }
-        queued = true;
 
-        if (after_eq(seq, call->rx_expect_next)) {
-                if (after(seq, call->rx_expect_next)) {
-                        _net("OOS %u > %u", seq, call->rx_expect_next);
-                        ack = RXRPC_ACK_OUT_OF_SEQUENCE;
-                        ack_serial = serial;
+                if (call->rxtx_buffer[ix]) {
+                        rxrpc_input_dup_data(call, seq, sp->nr_subpackets > 1,
+                                             &jumbo_bad);
+                        if (ack != RXRPC_ACK_DUPLICATE) {
+                                ack = RXRPC_ACK_DUPLICATE;
+                                ack_serial = serial;
+                        }
+                        immediate_ack = true;
+                        continue;
                 }
-                call->rx_expect_next = seq + 1;
-        }
 
-skip:
-        offset += len;
-        if (flags & RXRPC_JUMBO_PACKET) {
-                if (skb_copy_bits(skb, offset, &flags, 1) < 0) {
-                        rxrpc_proto_abort("XJF", call, seq);
-                        goto unlock;
-                }
-                offset += sizeof(struct rxrpc_jumbo_header);
-                seq++;
-                serial++;
-                annotation++;
-                if (flags & RXRPC_JUMBO_PACKET)
-                        annotation |= RXRPC_RX_ANNO_JLAST;
                 if (after(seq, hard_ack + call->rx_winsize)) {
                         ack = RXRPC_ACK_EXCEEDS_WINDOW;
                         ack_serial = serial;
-                        if (!jumbo_bad) {
-                                call->nr_jumbo_bad++;
-                                jumbo_bad = true;
+                        if (flags & RXRPC_JUMBO_PACKET) {
+                                if (!jumbo_bad) {
+                                        call->nr_jumbo_bad++;
+                                        jumbo_bad = true;
+                                }
                         }
+
                         goto ack;
                 }
 
-                _proto("Rx DATA Jumbo %%%u", serial);
-                goto next_subpacket;
-        }
+                if (flags & RXRPC_REQUEST_ACK && !ack) {
+                        ack = RXRPC_ACK_REQUESTED;
+                        ack_serial = serial;
+                }
+
+                /* Queue the packet.  We use a couple of memory barriers here as need
+                 * to make sure that rx_top is perceived to be set after the buffer
+                 * pointer and that the buffer pointer is set after the annotation and
+                 * the skb data.
+                 *
+                 * Barriers against rxrpc_recvmsg_data() and rxrpc_rotate_rx_window()
+                 * and also rxrpc_fill_out_ack().
+                 */
+                if (!terminal)
+                        rxrpc_get_skb(skb, rxrpc_skb_got);
+                call->rxtx_annotations[ix] = annotation;
+                smp_wmb();
+                call->rxtx_buffer[ix] = skb;
+                if (after(seq, call->rx_top)) {
+                        smp_store_release(&call->rx_top, seq);
+                } else if (before(seq, call->rx_top)) {
+                        /* Send an immediate ACK if we fill in a hole */
+                        if (!ack) {
+                                ack = RXRPC_ACK_DELAY;
+                                ack_serial = serial;
+                        }
+                        immediate_ack = true;
+                }
 
-        if (queued && flags & RXRPC_LAST_PACKET && !ack) {
-                ack = RXRPC_ACK_DELAY;
-                ack_serial = serial;
+                if (terminal) {
+                        /* From this point on, we're not allowed to touch the
+                         * packet any longer as its ref now belongs to the Rx
+                         * ring.
+                         */
+                        skb = NULL;
+                }
+
+                if (last) {
+                        set_bit(RXRPC_CALL_RX_LAST, &call->flags);
+                        if (!ack) {
+                                ack = RXRPC_ACK_DELAY;
+                                ack_serial = serial;
+                        }
+                        trace_rxrpc_receive(call, rxrpc_receive_queue_last, serial, seq);
+                } else {
+                        trace_rxrpc_receive(call, rxrpc_receive_queue, serial, seq);
+                }
+
+                if (after_eq(seq, call->rx_expect_next)) {
+                        if (after(seq, call->rx_expect_next)) {
+                                _net("OOS %u > %u", seq, call->rx_expect_next);
+                                ack = RXRPC_ACK_OUT_OF_SEQUENCE;
+                                ack_serial = serial;
+                        }
+                        call->rx_expect_next = seq + 1;
+                }
         }
 
 ack:
         if (ack)
-                rxrpc_propose_ACK(call, ack, skew, ack_serial,
+                rxrpc_propose_ACK(call, ack, ack_serial,
                                   immediate_ack, true,
                                   rxrpc_propose_ack_input_data);
         else
-                rxrpc_propose_ACK(call, RXRPC_ACK_DELAY, skew, serial,
+                rxrpc_propose_ACK(call, RXRPC_ACK_DELAY, serial,
                                   false, true,
                                   rxrpc_propose_ack_input_data);
 
-        if (sp->hdr.seq == READ_ONCE(call->rx_hard_ack) + 1) {
+        if (seq0 == READ_ONCE(call->rx_hard_ack) + 1) {
                 trace_rxrpc_notify_socket(call->debug_id, serial);
                 rxrpc_notify_socket(call);
         }
 
 unlock:
         spin_unlock(&call->input_lock);
+        rxrpc_free_skb(skb, rxrpc_skb_freed);
         _leave(" [queued]");
 }
 
@@ -822,8 +828,7 @@ static void rxrpc_input_soft_acks(struct rxrpc_call *call, u8 *acks,
  * soft-ACK means that the packet may be discarded and retransmission
  * requested.  A phase is complete when all packets are hard-ACK'd.
  */
-static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb,
-                            u16 skew)
+static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb)
 {
         struct rxrpc_ack_summary summary = { 0 };
         struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
@@ -867,11 +872,11 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb,
         if (buf.ack.reason == RXRPC_ACK_PING) {
                 _proto("Rx ACK %%%u PING Request", sp->hdr.serial);
                 rxrpc_propose_ACK(call, RXRPC_ACK_PING_RESPONSE,
-                                  skew, sp->hdr.serial, true, true,
+                                  sp->hdr.serial, true, true,
                                   rxrpc_propose_ack_respond_to_ping);
         } else if (sp->hdr.flags & RXRPC_REQUEST_ACK) {
                 rxrpc_propose_ACK(call, RXRPC_ACK_REQUESTED,
-                                  skew, sp->hdr.serial, true, true,
+                                  sp->hdr.serial, true, true,
                                   rxrpc_propose_ack_respond_to_ack);
         }
 
@@ -948,7 +953,7 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb,
             RXRPC_TX_ANNO_LAST &&
             summary.nr_acks == call->tx_top - hard_ack &&
             rxrpc_is_client_call(call))
-                rxrpc_propose_ACK(call, RXRPC_ACK_PING, skew, sp->hdr.serial,
+                rxrpc_propose_ACK(call, RXRPC_ACK_PING, sp->hdr.serial,
                                   false, true,
                                   rxrpc_propose_ack_ping_for_lost_reply);
 
@@ -1004,7 +1009,7 @@ static void rxrpc_input_abort(struct rxrpc_call *call, struct sk_buff *skb)
  * Process an incoming call packet.
  */
 static void rxrpc_input_call_packet(struct rxrpc_call *call,
-                                    struct sk_buff *skb, u16 skew)
+                                    struct sk_buff *skb)
 {
         struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
         unsigned long timo;
@@ -1023,11 +1028,11 @@ static void rxrpc_input_call_packet(struct rxrpc_call *call,
 
         switch (sp->hdr.type) {
         case RXRPC_PACKET_TYPE_DATA:
-                rxrpc_input_data(call, skb, skew);
-                break;
+                rxrpc_input_data(call, skb);
+                goto no_free;
 
         case RXRPC_PACKET_TYPE_ACK:
-                rxrpc_input_ack(call, skb, skew);
+                rxrpc_input_ack(call, skb);
                 break;
 
         case RXRPC_PACKET_TYPE_BUSY:
@@ -1051,6 +1056,8 @@ static void rxrpc_input_call_packet(struct rxrpc_call *call,
                 break;
         }
 
+        rxrpc_free_skb(skb, rxrpc_skb_freed);
+no_free:
         _leave("");
 }
 
@@ -1108,8 +1115,12 @@ static void rxrpc_post_packet_to_local(struct rxrpc_local *local,
 {
         _enter("%p,%p", local, skb);
 
-        skb_queue_tail(&local->event_queue, skb);
-        rxrpc_queue_local(local);
+        if (rxrpc_get_local_maybe(local)) {
+                skb_queue_tail(&local->event_queue, skb);
+                rxrpc_queue_local(local);
+        } else {
+                rxrpc_free_skb(skb, rxrpc_skb_freed);
+        }
 }
 
 /*
@@ -1119,8 +1130,12 @@ static void rxrpc_reject_packet(struct rxrpc_local *local, struct sk_buff *skb)
 {
         CHECK_SLAB_OKAY(&local->usage);
 
-        skb_queue_tail(&local->reject_queue, skb);
-        rxrpc_queue_local(local);
+        if (rxrpc_get_local_maybe(local)) {
+                skb_queue_tail(&local->reject_queue, skb);
+                rxrpc_queue_local(local);
+        } else {
+                rxrpc_free_skb(skb, rxrpc_skb_freed);
+        }
 }
 
 /*
@@ -1173,7 +1188,6 @@ int rxrpc_input_packet(struct sock *udp_sk, struct sk_buff *skb)
         struct rxrpc_peer *peer = NULL;
         struct rxrpc_sock *rx = NULL;
         unsigned int channel;
-        int skew = 0;
 
         _enter("%p", udp_sk);
 
@@ -1184,7 +1198,7 @@ int rxrpc_input_packet(struct sock *udp_sk, struct sk_buff *skb)
         if (skb->tstamp == 0)
                 skb->tstamp = ktime_get_real();
 
-        rxrpc_new_skb(skb, rxrpc_skb_rx_received);
+        rxrpc_new_skb(skb, rxrpc_skb_received);
 
         skb_pull(skb, sizeof(struct udphdr));
 
@@ -1201,7 +1215,7 @@ int rxrpc_input_packet(struct sock *udp_sk, struct sk_buff *skb)
                 static int lose;
                 if ((lose++ & 7) == 7) {
                         trace_rxrpc_rx_lose(sp);
-                        rxrpc_free_skb(skb, rxrpc_skb_rx_lost);
+                        rxrpc_free_skb(skb, rxrpc_skb_lost);
                         return 0;
                 }
         }
@@ -1233,9 +1247,26 @@ int rxrpc_input_packet(struct sock *udp_sk, struct sk_buff *skb)
                 if (sp->hdr.callNumber == 0 ||
                     sp->hdr.seq == 0)
                         goto bad_message;
-                if (sp->hdr.flags & RXRPC_JUMBO_PACKET &&
-                    !rxrpc_validate_jumbo(skb))
+                if (!rxrpc_validate_data(skb))
                         goto bad_message;
+
+                /* Unshare the packet so that it can be modified for in-place
+                 * decryption.
+                 */
+                if (sp->hdr.securityIndex != 0) {
+                        struct sk_buff *nskb = skb_unshare(skb, GFP_ATOMIC);
+                        if (!nskb) {
+                                rxrpc_eaten_skb(skb, rxrpc_skb_unshared_nomem);
+                                goto out;
+                        }
+
+                        if (nskb != skb) {
+                                rxrpc_eaten_skb(skb, rxrpc_skb_received);
+                                rxrpc_new_skb(skb, rxrpc_skb_unshared);
+                                skb = nskb;
+                                sp = rxrpc_skb(skb);
+                        }
+                }
                 break;
 
         case RXRPC_PACKET_TYPE_CHALLENGE:
@@ -1301,15 +1332,8 @@ int rxrpc_input_packet(struct sock *udp_sk, struct sk_buff *skb)
                         goto out;
                 }
 
-                /* Note the serial number skew here */
-                skew = (int)sp->hdr.serial - (int)conn->hi_serial;
-                if (skew >= 0) {
-                        if (skew > 0)
-                                conn->hi_serial = sp->hdr.serial;
-                } else {
-                        skew = -skew;
-                        skew = min(skew, 65535);
-                }
+                if ((int)sp->hdr.serial - (int)conn->hi_serial > 0)
+                        conn->hi_serial = sp->hdr.serial;
 
                 /* Call-bound packets are routed by connection channel. */
                 channel = sp->hdr.cid & RXRPC_CHANNELMASK;
@@ -1372,15 +1396,18 @@ int rxrpc_input_packet(struct sock *udp_sk, struct sk_buff *skb)
                 call = rxrpc_new_incoming_call(local, rx, skb);
                 if (!call)
                         goto reject_packet;
-                rxrpc_send_ping(call, skb, skew);
+                rxrpc_send_ping(call, skb);
                 mutex_unlock(&call->user_mutex);
         }
 
-        rxrpc_input_call_packet(call, skb, skew);
-        goto discard;
+        /* Process a call packet; this either discards or passes on the ref
+         * elsewhere.
+         */
+        rxrpc_input_call_packet(call, skb);
+        goto out;
 
 discard:
-        rxrpc_free_skb(skb, rxrpc_skb_rx_freed);
+        rxrpc_free_skb(skb, rxrpc_skb_freed);
 out:
         trace_rxrpc_rx_done(0, 0);
         return 0;
diff --git a/net/rxrpc/local_event.c b/net/rxrpc/local_event.c
index e93a78f7c05e..3ce6d628cd75 100644
--- a/net/rxrpc/local_event.c
+++ b/net/rxrpc/local_event.c
@@ -90,7 +90,7 @@ void rxrpc_process_local_events(struct rxrpc_local *local)
         if (skb) {
                 struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
 
-                rxrpc_see_skb(skb, rxrpc_skb_rx_seen);
+                rxrpc_see_skb(skb, rxrpc_skb_seen);
                 _debug("{%d},{%u}", local->debug_id, sp->hdr.type);
 
                 switch (sp->hdr.type) {
@@ -108,7 +108,7 @@ void rxrpc_process_local_events(struct rxrpc_local *local)
                         break;
                 }
 
-                rxrpc_free_skb(skb, rxrpc_skb_rx_freed);
+                rxrpc_free_skb(skb, rxrpc_skb_freed);
         }
 
         _leave("");
diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c
index b1c71bad510b..36587260cabd 100644
--- a/net/rxrpc/local_object.c
+++ b/net/rxrpc/local_object.c
@@ -79,6 +79,7 @@ static struct rxrpc_local *rxrpc_alloc_local(struct rxrpc_net *rxnet,
         local = kzalloc(sizeof(struct rxrpc_local), GFP_KERNEL);
         if (local) {
                 atomic_set(&local->usage, 1);
+                atomic_set(&local->active_users, 1);
                 local->rxnet = rxnet;
                 INIT_LIST_HEAD(&local->link);
                 INIT_WORK(&local->processor, rxrpc_local_processor);
@@ -92,7 +93,7 @@ static struct rxrpc_local *rxrpc_alloc_local(struct rxrpc_net *rxnet,
                 local->debug_id = atomic_inc_return(&rxrpc_debug_id);
                 memcpy(&local->srx, srx, sizeof(*srx));
                 local->srx.srx_service = 0;
-                trace_rxrpc_local(local, rxrpc_local_new, 1, NULL);
+                trace_rxrpc_local(local->debug_id, rxrpc_local_new, 1, NULL);
         }
 
         _leave(" = %p", local);
@@ -266,11 +267,8 @@ struct rxrpc_local *rxrpc_lookup_local(struct net *net,
                  * bind the transport socket may still fail if we're attempting
                  * to use a local address that the dying object is still using.
                  */
-                if (!rxrpc_get_local_maybe(local)) {
-                        cursor = cursor->next;
-                        list_del_init(&local->link);
+                if (!rxrpc_use_local(local))
                         break;
-                }
 
                 age = "old";
                 goto found;
@@ -284,7 +282,10 @@ struct rxrpc_local *rxrpc_lookup_local(struct net *net,
         if (ret < 0)
                 goto sock_error;
 
-        list_add_tail(&local->link, cursor);
+        if (cursor != &rxnet->local_endpoints)
+                list_replace_init(cursor, &local->link);
+        else
+                list_add_tail(&local->link, cursor);
         age = "new";
 
 found:
@@ -320,7 +321,7 @@ struct rxrpc_local *rxrpc_get_local(struct rxrpc_local *local)
         int n;
 
         n = atomic_inc_return(&local->usage);
-        trace_rxrpc_local(local, rxrpc_local_got, n, here);
+        trace_rxrpc_local(local->debug_id, rxrpc_local_got, n, here);
         return local;
 }
 
@@ -334,7 +335,8 @@ struct rxrpc_local *rxrpc_get_local_maybe(struct rxrpc_local *local)
         if (local) {
                 int n = atomic_fetch_add_unless(&local->usage, 1, 0);
                 if (n > 0)
-                        trace_rxrpc_local(local, rxrpc_local_got, n + 1, here);
+                        trace_rxrpc_local(local->debug_id, rxrpc_local_got,
+                                          n + 1, here);
                 else
                         local = NULL;
         }
@@ -342,24 +344,18 @@ struct rxrpc_local *rxrpc_get_local_maybe(struct rxrpc_local *local)
 }
 
 /*
- * Queue a local endpoint.
+ * Queue a local endpoint and pass the caller's reference to the work item.
  */
 void rxrpc_queue_local(struct rxrpc_local *local)
 {
         const void *here = __builtin_return_address(0);
+        unsigned int debug_id = local->debug_id;
+        int n = atomic_read(&local->usage);
 
         if (rxrpc_queue_work(&local->processor))
-                trace_rxrpc_local(local, rxrpc_local_queued,
-                                  atomic_read(&local->usage), here);
-}
-
-/*
- * A local endpoint reached its end of life.
- */
-static void __rxrpc_put_local(struct rxrpc_local *local)
-{
-        _enter("%d", local->debug_id);
-        rxrpc_queue_work(&local->processor);
+                trace_rxrpc_local(debug_id, rxrpc_local_queued, n, here);
+        else
+                rxrpc_put_local(local);
 }
 
 /*
@@ -372,10 +368,47 @@ void rxrpc_put_local(struct rxrpc_local *local)
 
         if (local) {
                 n = atomic_dec_return(&local->usage);
-                trace_rxrpc_local(local, rxrpc_local_put, n, here);
+                trace_rxrpc_local(local->debug_id, rxrpc_local_put, n, here);
 
                 if (n == 0)
-                        __rxrpc_put_local(local);
+                        call_rcu(&local->rcu, rxrpc_local_rcu);
+        }
+}
+
+/*
+ * Start using a local endpoint.
+ */
+struct rxrpc_local *rxrpc_use_local(struct rxrpc_local *local)
+{
+        unsigned int au;
+
+        local = rxrpc_get_local_maybe(local);
+        if (!local)
+                return NULL;
+
+        au = atomic_fetch_add_unless(&local->active_users, 1, 0);
+        if (au == 0) {
+                rxrpc_put_local(local);
+                return NULL;
+        }
+
+        return local;
+}
+
+/*
+ * Cease using a local endpoint.  Once the number of active users reaches 0, we
+ * start the closure of the transport in the work processor.
+ */
+void rxrpc_unuse_local(struct rxrpc_local *local)
+{
+        unsigned int au;
+
+        if (local) {
+                au = atomic_dec_return(&local->active_users);
+                if (au == 0)
+                        rxrpc_queue_local(local);
+                else
+                        rxrpc_put_local(local);
         }
 }
 
@@ -393,21 +426,14 @@ static void rxrpc_local_destroyer(struct rxrpc_local *local)
 
         _enter("%d", local->debug_id);
 
-        /* We can get a race between an incoming call packet queueing the
-         * processor again and the work processor starting the destruction
-         * process which will shut down the UDP socket.
-         */
-        if (local->dead) {
-                _leave(" [already dead]");
-                return;
-        }
         local->dead = true;
 
         mutex_lock(&rxnet->local_mutex);
         list_del_init(&local->link);
         mutex_unlock(&rxnet->local_mutex);
 
-        ASSERT(RB_EMPTY_ROOT(&local->client_conns));
+        rxrpc_clean_up_local_conns(local);
+        rxrpc_service_connection_reaper(&rxnet->service_conn_reaper);
         ASSERT(!local->service);
 
         if (socket) {
@@ -422,13 +448,11 @@ static void rxrpc_local_destroyer(struct rxrpc_local *local)
          */
         rxrpc_purge_queue(&local->reject_queue);
         rxrpc_purge_queue(&local->event_queue);
-
-        _debug("rcu local %d", local->debug_id);
-        call_rcu(&local->rcu, rxrpc_local_rcu);
 }
 
 /*
- * Process events on an endpoint
+ * Process events on an endpoint.  The work item carries a ref which
+ * we must release.
  */
 static void rxrpc_local_processor(struct work_struct *work)
 {
@@ -436,13 +460,15 @@ static void rxrpc_local_processor(struct work_struct *work)
                 container_of(work, struct rxrpc_local, processor);
         bool again;
 
-        trace_rxrpc_local(local, rxrpc_local_processing,
+        trace_rxrpc_local(local->debug_id, rxrpc_local_processing,
                           atomic_read(&local->usage), NULL);
 
         do {
                 again = false;
-                if (atomic_read(&local->usage) == 0)
-                        return rxrpc_local_destroyer(local);
+                if (atomic_read(&local->active_users) == 0) {
+                        rxrpc_local_destroyer(local);
+                        break;
+                }
 
                 if (!skb_queue_empty(&local->reject_queue)) {
                         rxrpc_reject_packets(local);
@@ -454,6 +480,8 @@ static void rxrpc_local_processor(struct work_struct *work)
                         again = true;
                 }
         } while (again);
+
+        rxrpc_put_local(local);
 }
 
 /*
diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c
index 948e3fe249ec..935bb60fff56 100644
--- a/net/rxrpc/output.c
+++ b/net/rxrpc/output.c
@@ -87,7 +87,7 @@ static size_t rxrpc_fill_out_ack(struct rxrpc_connection *conn,
         *_top = top;
 
         pkt->ack.bufferSpace    = htons(8);
-        pkt->ack.maxSkew        = htons(call->ackr_skew);
+        pkt->ack.maxSkew        = htons(0);
         pkt->ack.firstPacket    = htonl(hard_ack + 1);
         pkt->ack.previousPacket = htonl(call->ackr_prev_seq);
         pkt->ack.serial         = htonl(serial);
@@ -228,7 +228,6 @@ int rxrpc_send_ack_packet(struct rxrpc_call *call, bool ping,
                         if (ping)
                                 clear_bit(RXRPC_CALL_PINGING, &call->flags);
                         rxrpc_propose_ACK(call, pkt->ack.reason,
-                                          ntohs(pkt->ack.maxSkew),
                                           ntohl(pkt->ack.serial),
                                           false, true,
                                           rxrpc_propose_ack_retry_tx);
@@ -566,7 +565,7 @@ void rxrpc_reject_packets(struct rxrpc_local *local)
         memset(&whdr, 0, sizeof(whdr));
 
         while ((skb = skb_dequeue(&local->reject_queue))) {
-                rxrpc_see_skb(skb, rxrpc_skb_rx_seen);
+                rxrpc_see_skb(skb, rxrpc_skb_seen);
                 sp = rxrpc_skb(skb);
 
                 switch (skb->mark) {
@@ -582,7 +581,7 @@ void rxrpc_reject_packets(struct rxrpc_local *local)
                         ioc = 2;
                         break;
                 default:
-                        rxrpc_free_skb(skb, rxrpc_skb_rx_freed);
+                        rxrpc_free_skb(skb, rxrpc_skb_freed);
                         continue;
                 }
 
@@ -607,7 +606,7 @@ void rxrpc_reject_packets(struct rxrpc_local *local)
                                                       rxrpc_tx_point_reject);
                 }
 
-                rxrpc_free_skb(skb, rxrpc_skb_rx_freed);
+                rxrpc_free_skb(skb, rxrpc_skb_freed);
         }
 
         _leave("");
diff --git a/net/rxrpc/peer_event.c b/net/rxrpc/peer_event.c
index 7666ec72d37e..c97ebdc043e4 100644
--- a/net/rxrpc/peer_event.c
+++ b/net/rxrpc/peer_event.c
@@ -163,11 +163,11 @@ void rxrpc_error_report(struct sock *sk)
                 _leave("UDP socket errqueue empty");
                 return;
         }
-        rxrpc_new_skb(skb, rxrpc_skb_rx_received);
+        rxrpc_new_skb(skb, rxrpc_skb_received);
         serr = SKB_EXT_ERR(skb);
         if (!skb->len && serr->ee.ee_origin == SO_EE_ORIGIN_TIMESTAMPING) {
                 _leave("UDP empty message");
-                rxrpc_free_skb(skb, rxrpc_skb_rx_freed);
+                rxrpc_free_skb(skb, rxrpc_skb_freed);
                 return;
         }
 
@@ -177,7 +177,7 @@ void rxrpc_error_report(struct sock *sk)
                 peer = NULL;
         if (!peer) {
                 rcu_read_unlock();
-                rxrpc_free_skb(skb, rxrpc_skb_rx_freed);
+                rxrpc_free_skb(skb, rxrpc_skb_freed);
                 _leave(" [no peer]");
                 return;
         }
@@ -189,7 +189,7 @@ void rxrpc_error_report(struct sock *sk)
              serr->ee.ee_code == ICMP_FRAG_NEEDED)) {
                 rxrpc_adjust_mtu(peer, serr);
                 rcu_read_unlock();
-                rxrpc_free_skb(skb, rxrpc_skb_rx_freed);
+                rxrpc_free_skb(skb, rxrpc_skb_freed);
                 rxrpc_put_peer(peer);
                 _leave(" [MTU update]");
                 return;
@@ -197,7 +197,7 @@ void rxrpc_error_report(struct sock *sk)
 
         rxrpc_store_error(peer, serr);
         rcu_read_unlock();
-        rxrpc_free_skb(skb, rxrpc_skb_rx_freed);
+        rxrpc_free_skb(skb, rxrpc_skb_freed);
         rxrpc_put_peer(peer);
 
         _leave("");
diff --git a/net/rxrpc/protocol.h b/net/rxrpc/protocol.h
index 99ce322d7caa..49bb972539aa 100644
--- a/net/rxrpc/protocol.h
+++ b/net/rxrpc/protocol.h
@@ -89,6 +89,15 @@ struct rxrpc_jumbo_header {
 #define RXRPC_JUMBO_DATALEN     1412    /* non-terminal jumbo packet data length */
 #define RXRPC_JUMBO_SUBPKTLEN   (RXRPC_JUMBO_DATALEN + sizeof(struct rxrpc_jumbo_header))
 
+/*
+ * The maximum number of subpackets that can possibly fit in a UDP packet is:
+ *
+ *      ((max_IP - IP_hdr - UDP_hdr) / RXRPC_JUMBO_SUBPKTLEN) + 1
+ *      = ((65535 - 28 - 28) / 1416) + 1
+ *      = 46 non-terminal packets and 1 terminal packet.
+ */
+#define RXRPC_MAX_NR_JUMBO      47
+
 /*****************************************************************************/
 /*
  * on-the-wire Rx ACK packet data payload
diff --git a/net/rxrpc/recvmsg.c b/net/rxrpc/recvmsg.c
index 5abf46cf9e6c..3b0becb12041 100644
--- a/net/rxrpc/recvmsg.c
+++ b/net/rxrpc/recvmsg.c
@@ -141,7 +141,7 @@ static void rxrpc_end_rx_phase(struct rxrpc_call *call, rxrpc_serial_t serial)
         ASSERTCMP(call->rx_hard_ack, ==, call->rx_top);
 
         if (call->state == RXRPC_CALL_CLIENT_RECV_REPLY) {
-                rxrpc_propose_ACK(call, RXRPC_ACK_IDLE, 0, serial, false, true,
+                rxrpc_propose_ACK(call, RXRPC_ACK_IDLE, serial, false, true,
                                   rxrpc_propose_ack_terminal_ack);
                 //rxrpc_send_ack_packet(call, false, NULL);
         }
@@ -159,7 +159,7 @@ static void rxrpc_end_rx_phase(struct rxrpc_call *call, rxrpc_serial_t serial)
                 call->state = RXRPC_CALL_SERVER_ACK_REQUEST;
                 call->expect_req_by = jiffies + MAX_JIFFY_OFFSET;
                 write_unlock_bh(&call->state_lock);
-                rxrpc_propose_ACK(call, RXRPC_ACK_DELAY, 0, serial, false, true,
+                rxrpc_propose_ACK(call, RXRPC_ACK_DELAY, serial, false, true,
                                   rxrpc_propose_ack_processing_op);
                 break;
         default:
@@ -177,7 +177,8 @@ static void rxrpc_rotate_rx_window(struct rxrpc_call *call)
         struct sk_buff *skb;
         rxrpc_serial_t serial;
         rxrpc_seq_t hard_ack, top;
-        u8 flags;
+        bool last = false;
+        u8 subpacket;
         int ix;
 
         _enter("%d", call->debug_id);
@@ -189,30 +190,32 @@ static void rxrpc_rotate_rx_window(struct rxrpc_call *call)
         hard_ack++;
         ix = hard_ack & RXRPC_RXTX_BUFF_MASK;
         skb = call->rxtx_buffer[ix];
-        rxrpc_see_skb(skb, rxrpc_skb_rx_rotated);
+        rxrpc_see_skb(skb, rxrpc_skb_rotated);
         sp = rxrpc_skb(skb);
-        flags = sp->hdr.flags;
-        serial = sp->hdr.serial;
-        if (call->rxtx_annotations[ix] & RXRPC_RX_ANNO_JUMBO)
-                serial += (call->rxtx_annotations[ix] & RXRPC_RX_ANNO_JUMBO) - 1;
+
+        subpacket = call->rxtx_annotations[ix] & RXRPC_RX_ANNO_SUBPACKET;
+        serial = sp->hdr.serial + subpacket;
+
+        if (subpacket == sp->nr_subpackets - 1 &&
+            sp->rx_flags & RXRPC_SKB_INCL_LAST)
+                last = true;
 
         call->rxtx_buffer[ix] = NULL;
         call->rxtx_annotations[ix] = 0;
         /* Barrier against rxrpc_input_data(). */
         smp_store_release(&call->rx_hard_ack, hard_ack);
 
-        rxrpc_free_skb(skb, rxrpc_skb_rx_freed);
+        rxrpc_free_skb(skb, rxrpc_skb_freed);
 
-        _debug("%u,%u,%02x", hard_ack, top, flags);
         trace_rxrpc_receive(call, rxrpc_receive_rotate, serial, hard_ack);
-        if (flags & RXRPC_LAST_PACKET) {
+        if (last) {
                 rxrpc_end_rx_phase(call, serial);
         } else {
                 /* Check to see if there's an ACK that needs sending. */
                 if (after_eq(hard_ack, call->ackr_consumed + 2) ||
                     after_eq(top, call->ackr_seen + 2) ||
                     (hard_ack == top && after(hard_ack, call->ackr_consumed)))
-                        rxrpc_propose_ACK(call, RXRPC_ACK_DELAY, 0, serial,
+                        rxrpc_propose_ACK(call, RXRPC_ACK_DELAY, serial,
                                           true, true,
                                           rxrpc_propose_ack_rotate_rx);
                 if (call->ackr_reason && call->ackr_reason != RXRPC_ACK_DELAY)
@@ -233,18 +236,19 @@ static int rxrpc_verify_packet(struct rxrpc_call *call, struct sk_buff *skb,
         struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
         rxrpc_seq_t seq = sp->hdr.seq;
         u16 cksum = sp->hdr.cksum;
+        u8 subpacket = annotation & RXRPC_RX_ANNO_SUBPACKET;
 
         _enter("");
 
         /* For all but the head jumbo subpacket, the security checksum is in a
          * jumbo header immediately prior to the data.
          */
-        if ((annotation & RXRPC_RX_ANNO_JUMBO) > 1) {
+        if (subpacket > 0) {
                 __be16 tmp;
                 if (skb_copy_bits(skb, offset - 2, &tmp, 2) < 0)
                         BUG();
                 cksum = ntohs(tmp);
-                seq += (annotation & RXRPC_RX_ANNO_JUMBO) - 1;
+                seq += subpacket;
         }
 
         return call->conn->security->verify_packet(call, skb, offset, len,
@@ -265,19 +269,18 @@ static int rxrpc_locate_data(struct rxrpc_call *call, struct sk_buff *skb,
                              u8 *_annotation,
                              unsigned int *_offset, unsigned int *_len)
 {
+        struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
         unsigned int offset = sizeof(struct rxrpc_wire_header);
         unsigned int len;
         int ret;
         u8 annotation = *_annotation;
+        u8 subpacket = annotation & RXRPC_RX_ANNO_SUBPACKET;
 
         /* Locate the subpacket */
+        offset += subpacket * RXRPC_JUMBO_SUBPKTLEN;
         len = skb->len - offset;
-        if ((annotation & RXRPC_RX_ANNO_JUMBO) > 0) {
-                offset += (((annotation & RXRPC_RX_ANNO_JUMBO) - 1) *
-                           RXRPC_JUMBO_SUBPKTLEN);
-                len = (annotation & RXRPC_RX_ANNO_JLAST) ?
-                        skb->len - offset : RXRPC_JUMBO_SUBPKTLEN;
-        }
+        if (subpacket < sp->nr_subpackets - 1)
+                len = RXRPC_JUMBO_DATALEN;
 
         if (!(annotation & RXRPC_RX_ANNO_VERIFIED)) {
                 ret = rxrpc_verify_packet(call, skb, annotation, offset, len);
@@ -303,6 +306,7 @@ static int rxrpc_recvmsg_data(struct socket *sock, struct rxrpc_call *call,
 {
         struct rxrpc_skb_priv *sp;
         struct sk_buff *skb;
+        rxrpc_serial_t serial;
         rxrpc_seq_t hard_ack, top, seq;
         size_t remain;
         bool last;
@@ -336,12 +340,15 @@ static int rxrpc_recvmsg_data(struct socket *sock, struct rxrpc_call *call,
                         break;
                 }
                 smp_rmb();
-                rxrpc_see_skb(skb, rxrpc_skb_rx_seen);
+                rxrpc_see_skb(skb, rxrpc_skb_seen);
                 sp = rxrpc_skb(skb);
 
-                if (!(flags & MSG_PEEK))
+                if (!(flags & MSG_PEEK)) {
+                        serial = sp->hdr.serial;
+                        serial += call->rxtx_annotations[ix] & RXRPC_RX_ANNO_SUBPACKET;
                         trace_rxrpc_receive(call, rxrpc_receive_front,
-                                            sp->hdr.serial, seq);
+                                            serial, seq);
+                }
 
                 if (msg)
                         sock_recv_timestamp(msg, sock->sk, skb);
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index ae8cd8926456..c60c520fde7c 100644
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -187,10 +187,8 @@ static int rxkad_secure_packet_encrypt(const struct rxrpc_call *call,
         struct rxrpc_skb_priv *sp;
         struct rxrpc_crypt iv;
         struct scatterlist sg[16];
-        struct sk_buff *trailer;
         unsigned int len;
         u16 check;
-        int nsg;
         int err;
 
         sp = rxrpc_skb(skb);
@@ -214,15 +212,14 @@ static int rxkad_secure_packet_encrypt(const struct rxrpc_call *call,
         crypto_skcipher_encrypt(req);
 
         /* we want to encrypt the skbuff in-place */
-        nsg = skb_cow_data(skb, 0, &trailer);
-        err = -ENOMEM;
-        if (nsg < 0 || nsg > 16)
+        err = -EMSGSIZE;
+        if (skb_shinfo(skb)->nr_frags > 16)
                 goto out;
 
         len = data_size + call->conn->size_align - 1;
         len &= ~(call->conn->size_align - 1);
 
-        sg_init_table(sg, nsg);
+        sg_init_table(sg, ARRAY_SIZE(sg));
         err = skb_to_sgvec(skb, sg, 0, len);
         if (unlikely(err < 0))
                 goto out;
@@ -319,11 +316,10 @@ static int rxkad_verify_packet_1(struct rxrpc_call *call, struct sk_buff *skb,
         struct rxkad_level1_hdr sechdr;
         struct rxrpc_crypt iv;
         struct scatterlist sg[16];
-        struct sk_buff *trailer;
         bool aborted;
         u32 data_size, buf;
         u16 check;
-        int nsg, ret;
+        int ret;
 
         _enter("");
 
@@ -336,11 +332,7 @@ static int rxkad_verify_packet_1(struct rxrpc_call *call, struct sk_buff *skb,
         /* Decrypt the skbuff in-place.  TODO: We really want to decrypt
          * directly into the target buffer.
          */
-        nsg = skb_cow_data(skb, 0, &trailer);
-        if (nsg < 0 || nsg > 16)
-                goto nomem;
-
-        sg_init_table(sg, nsg);
+        sg_init_table(sg, ARRAY_SIZE(sg));
         ret = skb_to_sgvec(skb, sg, offset, 8);
         if (unlikely(ret < 0))
                 return ret;
@@ -388,10 +380,6 @@ protocol_error:
         if (aborted)
                 rxrpc_send_abort_packet(call);
         return -EPROTO;
-
-nomem:
-        _leave(" = -ENOMEM");
-        return -ENOMEM;
 }
 
 /*
@@ -406,7 +394,6 @@ static int rxkad_verify_packet_2(struct rxrpc_call *call, struct sk_buff *skb,
         struct rxkad_level2_hdr sechdr;
         struct rxrpc_crypt iv;
         struct scatterlist _sg[4], *sg;
-        struct sk_buff *trailer;
         bool aborted;
         u32 data_size, buf;
         u16 check;
@@ -423,12 +410,11 @@ static int rxkad_verify_packet_2(struct rxrpc_call *call, struct sk_buff *skb,
         /* Decrypt the skbuff in-place.  TODO: We really want to decrypt
          * directly into the target buffer.
          */
-        nsg = skb_cow_data(skb, 0, &trailer);
-        if (nsg < 0)
-                goto nomem;
-
         sg = _sg;
-        if (unlikely(nsg > 4)) {
+        nsg = skb_shinfo(skb)->nr_frags;
+        if (nsg <= 4) {
+                nsg = 4;
+        } else {
                 sg = kmalloc_array(nsg, sizeof(*sg), GFP_NOIO);
                 if (!sg)
                         goto nomem;
diff --git a/net/rxrpc/sendmsg.c b/net/rxrpc/sendmsg.c
index bae14438f869..6a1547b270fe 100644
--- a/net/rxrpc/sendmsg.c
+++ b/net/rxrpc/sendmsg.c
@@ -176,7 +176,7 @@ static int rxrpc_queue_packet(struct rxrpc_sock *rx, struct rxrpc_call *call,
         skb->tstamp = ktime_get_real();
 
         ix = seq & RXRPC_RXTX_BUFF_MASK;
-        rxrpc_get_skb(skb, rxrpc_skb_tx_got);
+        rxrpc_get_skb(skb, rxrpc_skb_got);
         call->rxtx_annotations[ix] = annotation;
         smp_wmb();
         call->rxtx_buffer[ix] = skb;
@@ -248,7 +248,7 @@ static int rxrpc_queue_packet(struct rxrpc_sock *rx, struct rxrpc_call *call,
         }
 
 out:
-        rxrpc_free_skb(skb, rxrpc_skb_tx_freed);
+        rxrpc_free_skb(skb, rxrpc_skb_freed);
         _leave(" = %d", ret);
         return ret;
 }
@@ -289,7 +289,7 @@ static int rxrpc_send_data(struct rxrpc_sock *rx,
 
         skb = call->tx_pending;
         call->tx_pending = NULL;
-        rxrpc_see_skb(skb, rxrpc_skb_tx_seen);
+        rxrpc_see_skb(skb, rxrpc_skb_seen);
 
         copied = 0;
         do {
@@ -336,7 +336,9 @@ static int rxrpc_send_data(struct rxrpc_sock *rx,
                         if (!skb)
                                 goto maybe_error;
 
-                        rxrpc_new_skb(skb, rxrpc_skb_tx_new);
+                        sp = rxrpc_skb(skb);
+                        sp->rx_flags |= RXRPC_SKB_TX_BUFFER;
+                        rxrpc_new_skb(skb, rxrpc_skb_new);
 
                         _debug("ALLOC SEND %p", skb);
 
@@ -346,7 +348,6 @@ static int rxrpc_send_data(struct rxrpc_sock *rx,
                         skb_reserve(skb, call->conn->security_size);
                         skb->len += call->conn->security_size;
 
-                        sp = rxrpc_skb(skb);
                         sp->remain = chunk;
                         if (sp->remain > skb_tailroom(skb))
                                 sp->remain = skb_tailroom(skb);
@@ -439,7 +440,7 @@ out:
         return ret;
 
 call_terminated:
-        rxrpc_free_skb(skb, rxrpc_skb_tx_freed);
+        rxrpc_free_skb(skb, rxrpc_skb_freed);
         _leave(" = %d", call->error);
         return call->error;
 
diff --git a/net/rxrpc/skbuff.c b/net/rxrpc/skbuff.c
index 9ad5045b7c2f..0348d2bf6f7d 100644
--- a/net/rxrpc/skbuff.c
+++ b/net/rxrpc/skbuff.c
@@ -14,7 +14,8 @@
 #include <net/af_rxrpc.h>
 #include "ar-internal.h"
 
-#define select_skb_count(op) (op >= rxrpc_skb_tx_cleaned ? &rxrpc_n_tx_skbs : &rxrpc_n_rx_skbs)
+#define is_tx_skb(skb) (rxrpc_skb(skb)->rx_flags & RXRPC_SKB_TX_BUFFER)
+#define select_skb_count(skb) (is_tx_skb(skb) ? &rxrpc_n_tx_skbs : &rxrpc_n_rx_skbs)
 
 /*
  * Note the allocation or reception of a socket buffer.
@@ -22,8 +23,9 @@
 void rxrpc_new_skb(struct sk_buff *skb, enum rxrpc_skb_trace op)
 {
         const void *here = __builtin_return_address(0);
-        int n = atomic_inc_return(select_skb_count(op));
-        trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n, here);
+        int n = atomic_inc_return(select_skb_count(skb));
+        trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n,
+                        rxrpc_skb(skb)->rx_flags, here);
 }
 
 /*
@@ -33,8 +35,9 @@ void rxrpc_see_skb(struct sk_buff *skb, enum rxrpc_skb_trace op)
 {
         const void *here = __builtin_return_address(0);
         if (skb) {
-                int n = atomic_read(select_skb_count(op));
-                trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n, here);
+                int n = atomic_read(select_skb_count(skb));
+                trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n,
+                                rxrpc_skb(skb)->rx_flags, here);
         }
 }
 
@@ -44,12 +47,23 @@ void rxrpc_see_skb(struct sk_buff *skb, enum rxrpc_skb_trace op)
 void rxrpc_get_skb(struct sk_buff *skb, enum rxrpc_skb_trace op)
 {
         const void *here = __builtin_return_address(0);
-        int n = atomic_inc_return(select_skb_count(op));
-        trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n, here);
+        int n = atomic_inc_return(select_skb_count(skb));
+        trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n,
+                        rxrpc_skb(skb)->rx_flags, here);
         skb_get(skb);
 }
 
 /*
+ * Note the dropping of a ref on a socket buffer by the core.
+ */
+void rxrpc_eaten_skb(struct sk_buff *skb, enum rxrpc_skb_trace op)
+{
+        const void *here = __builtin_return_address(0);
+        int n = atomic_inc_return(&rxrpc_n_rx_skbs);
+        trace_rxrpc_skb(skb, op, 0, n, 0, here);
+}
+
+/*
  * Note the destruction of a socket buffer.
  */
 void rxrpc_free_skb(struct sk_buff *skb, enum rxrpc_skb_trace op)
@@ -58,8 +72,9 @@ void rxrpc_free_skb(struct sk_buff *skb, enum rxrpc_skb_trace op)
         if (skb) {
                 int n;
                 CHECK_SLAB_OKAY(&skb->users);
-                n = atomic_dec_return(select_skb_count(op));
-                trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n, here);
+                n = atomic_dec_return(select_skb_count(skb));
+                trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n,
+                                rxrpc_skb(skb)->rx_flags, here);
                 kfree_skb(skb);
         }
 }
@@ -72,9 +87,10 @@ void rxrpc_purge_queue(struct sk_buff_head *list)
         const void *here = __builtin_return_address(0);
         struct sk_buff *skb;
         while ((skb = skb_dequeue((list))) != NULL) {
-                int n = atomic_dec_return(select_skb_count(rxrpc_skb_rx_purged));
-                trace_rxrpc_skb(skb, rxrpc_skb_rx_purged,
-                                refcount_read(&skb->users), n, here);
+                int n = atomic_dec_return(select_skb_count(skb));
+                trace_rxrpc_skb(skb, rxrpc_skb_purged,
+                                refcount_read(&skb->users), n,
+                                rxrpc_skb(skb)->rx_flags, here);
                 kfree_skb(skb);
         }
 }
diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c
index fd1f7e799e23..04b7bd4ec751 100644
--- a/net/sched/act_bpf.c
+++ b/net/sched/act_bpf.c
@@ -422,7 +422,7 @@ static __net_init int bpf_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, bpf_net_id);
 
-        return tc_action_net_init(tn, &act_bpf_ops);
+        return tc_action_net_init(net, tn, &act_bpf_ops);
 }
 
 static void __net_exit bpf_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c
index 32ac04d77a45..2b43cacf82af 100644
--- a/net/sched/act_connmark.c
+++ b/net/sched/act_connmark.c
@@ -231,7 +231,7 @@ static __net_init int connmark_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, connmark_net_id);
 
-        return tc_action_net_init(tn, &act_connmark_ops);
+        return tc_action_net_init(net, tn, &act_connmark_ops);
 }
 
 static void __net_exit connmark_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
index 9b9288267a54..d3cfad88dc3a 100644
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
@@ -714,7 +714,7 @@ static __net_init int csum_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, csum_net_id);
 
-        return tc_action_net_init(tn, &act_csum_ops);
+        return tc_action_net_init(net, tn, &act_csum_ops);
 }
 
 static void __net_exit csum_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c
index 33a1a7406e87..cdd6f3818097 100644
--- a/net/sched/act_ct.c
+++ b/net/sched/act_ct.c
@@ -939,7 +939,7 @@ static __net_init int ct_init_net(struct net *net)
                 tn->labels = true;
         }
 
-        return tc_action_net_init(&tn->tn, &act_ct_ops);
+        return tc_action_net_init(net, &tn->tn, &act_ct_ops);
 }
 
 static void __net_exit ct_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_ctinfo.c b/net/sched/act_ctinfo.c
index 06ef74b74911..0dbcfd1dca7b 100644
--- a/net/sched/act_ctinfo.c
+++ b/net/sched/act_ctinfo.c
@@ -376,7 +376,7 @@ static __net_init int ctinfo_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, ctinfo_net_id);
 
-        return tc_action_net_init(tn, &act_ctinfo_ops);
+        return tc_action_net_init(net, tn, &act_ctinfo_ops);
 }
 
 static void __net_exit ctinfo_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
index 8f0140c6ca58..324f1d1f6d47 100644
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
@@ -278,7 +278,7 @@ static __net_init int gact_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, gact_net_id);
 
-        return tc_action_net_init(tn, &act_gact_ops);
+        return tc_action_net_init(net, tn, &act_gact_ops);
 }
 
 static void __net_exit gact_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
index 92ee853d43e6..3a31e241c647 100644
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
@@ -890,7 +890,7 @@ static __net_init int ife_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, ife_net_id);
 
-        return tc_action_net_init(tn, &act_ife_ops);
+        return tc_action_net_init(net, tn, &act_ife_ops);
 }
 
 static void __net_exit ife_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index ce2c30a591d2..214a03d405cf 100644
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -61,12 +61,13 @@ static int ipt_init_target(struct net *net, struct xt_entry_target *t,
         return 0;
 }
 
-static void ipt_destroy_target(struct xt_entry_target *t)
+static void ipt_destroy_target(struct xt_entry_target *t, struct net *net)
 {
         struct xt_tgdtor_param par = {
                 .target   = t->u.kernel.target,
                 .targinfo = t->data,
                 .family   = NFPROTO_IPV4,
+                .net      = net,
         };
         if (par.target->destroy != NULL)
                 par.target->destroy(&par);
@@ -78,7 +79,7 @@ static void tcf_ipt_release(struct tc_action *a)
         struct tcf_ipt *ipt = to_ipt(a);
 
         if (ipt->tcfi_t) {
-                ipt_destroy_target(ipt->tcfi_t);
+                ipt_destroy_target(ipt->tcfi_t, a->idrinfo->net);
                 kfree(ipt->tcfi_t);
         }
         kfree(ipt->tcfi_tname);
@@ -180,7 +181,7 @@ static int __tcf_ipt_init(struct net *net, unsigned int id, struct nlattr *nla,
 
         spin_lock_bh(&ipt->tcf_lock);
         if (ret != ACT_P_CREATED) {
-                ipt_destroy_target(ipt->tcfi_t);
+                ipt_destroy_target(ipt->tcfi_t, net);
                 kfree(ipt->tcfi_tname);
                 kfree(ipt->tcfi_t);
         }
@@ -350,7 +351,7 @@ static __net_init int ipt_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, ipt_net_id);
 
-        return tc_action_net_init(tn, &act_ipt_ops);
+        return tc_action_net_init(net, tn, &act_ipt_ops);
 }
 
 static void __net_exit ipt_exit_net(struct list_head *net_list)
@@ -399,7 +400,7 @@ static __net_init int xt_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, xt_net_id);
 
-        return tc_action_net_init(tn, &act_xt_ops);
+        return tc_action_net_init(net, tn, &act_xt_ops);
 }
 
 static void __net_exit xt_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index be3f88dfc37e..9d1bf508075a 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -453,7 +453,7 @@ static __net_init int mirred_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, mirred_net_id);
 
-        return tc_action_net_init(tn, &act_mirred_ops);
+        return tc_action_net_init(net, tn, &act_mirred_ops);
 }
 
 static void __net_exit mirred_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_mpls.c b/net/sched/act_mpls.c
index 0f299e3b618c..e168df0e008a 100644
--- a/net/sched/act_mpls.c
+++ b/net/sched/act_mpls.c
@@ -375,7 +375,7 @@ static __net_init int mpls_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, mpls_net_id);
 
-        return tc_action_net_init(tn, &act_mpls_ops);
+        return tc_action_net_init(net, tn, &act_mpls_ops);
 }
 
 static void __net_exit mpls_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c
index 7b858c11b1b5..ea4c5359e7df 100644
--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
@@ -327,7 +327,7 @@ static __net_init int nat_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, nat_net_id);
 
-        return tc_action_net_init(tn, &act_nat_ops);
+        return tc_action_net_init(net, tn, &act_nat_ops);
 }
 
 static void __net_exit nat_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 17360c6faeaa..cdfaa79382a2 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -498,7 +498,7 @@ static __net_init int pedit_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, pedit_net_id);
 
-        return tc_action_net_init(tn, &act_pedit_ops);
+        return tc_action_net_init(net, tn, &act_pedit_ops);
 }
 
 static void __net_exit pedit_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 49cec3e64a4d..6315e0f8d26e 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -371,7 +371,7 @@ static __net_init int police_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, police_net_id);
 
-        return tc_action_net_init(tn, &act_police_ops);
+        return tc_action_net_init(net, tn, &act_police_ops);
 }
 
 static void __net_exit police_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c
index 595308d60133..10229124a992 100644
--- a/net/sched/act_sample.c
+++ b/net/sched/act_sample.c
@@ -102,13 +102,17 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla,
         goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch);
         s->rate = rate;
         s->psample_group_num = psample_group_num;
-        RCU_INIT_POINTER(s->psample_group, psample_group);
+        rcu_swap_protected(s->psample_group, psample_group,
+                           lockdep_is_held(&s->tcf_lock));
 
         if (tb[TCA_SAMPLE_TRUNC_SIZE]) {
                 s->truncate = true;
                 s->trunc_size = nla_get_u32(tb[TCA_SAMPLE_TRUNC_SIZE]);
         }
         spin_unlock_bh(&s->tcf_lock);
+
+        if (psample_group)
+                psample_group_put(psample_group);
         if (goto_ch)
                 tcf_chain_put_by_act(goto_ch);
 
@@ -265,7 +269,7 @@ static __net_init int sample_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, sample_net_id);
 
-        return tc_action_net_init(tn, &act_sample_ops);
+        return tc_action_net_init(net, tn, &act_sample_ops);
 }
 
 static void __net_exit sample_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index 33aefa25b545..6120e56117ca 100644
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -232,7 +232,7 @@ static __net_init int simp_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, simp_net_id);
 
-        return tc_action_net_init(tn, &act_simp_ops);
+        return tc_action_net_init(net, tn, &act_simp_ops);
 }
 
 static void __net_exit simp_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
index b100870f02a6..6a8d3337c577 100644
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
@@ -307,6 +307,17 @@ static int tcf_skbedit_search(struct net *net, struct tc_action **a, u32 index)
         return tcf_idr_search(tn, a, index);
 }
 
+static size_t tcf_skbedit_get_fill_size(const struct tc_action *act)
+{
+        return nla_total_size(sizeof(struct tc_skbedit))
+                + nla_total_size(sizeof(u32)) /* TCA_SKBEDIT_PRIORITY */
+                + nla_total_size(sizeof(u16)) /* TCA_SKBEDIT_QUEUE_MAPPING */
+                + nla_total_size(sizeof(u32)) /* TCA_SKBEDIT_MARK */
+                + nla_total_size(sizeof(u16)) /* TCA_SKBEDIT_PTYPE */
+                + nla_total_size(sizeof(u32)) /* TCA_SKBEDIT_MASK */
+                + nla_total_size_64bit(sizeof(u64)); /* TCA_SKBEDIT_FLAGS */
+}
+
 static struct tc_action_ops act_skbedit_ops = {
         .kind           =       "skbedit",
         .id             =       TCA_ID_SKBEDIT,
@@ -316,6 +327,7 @@ static struct tc_action_ops act_skbedit_ops = {
         .init           =       tcf_skbedit_init,
         .cleanup        =       tcf_skbedit_cleanup,
         .walk           =       tcf_skbedit_walker,
+        .get_fill_size  =       tcf_skbedit_get_fill_size,
         .lookup         =       tcf_skbedit_search,
         .size           =       sizeof(struct tcf_skbedit),
 };
@@ -324,7 +336,7 @@ static __net_init int skbedit_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, skbedit_net_id);
 
-        return tc_action_net_init(tn, &act_skbedit_ops);
+        return tc_action_net_init(net, tn, &act_skbedit_ops);
 }
 
 static void __net_exit skbedit_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_skbmod.c b/net/sched/act_skbmod.c
index 7da3518e18ef..888437f97ba6 100644
--- a/net/sched/act_skbmod.c
+++ b/net/sched/act_skbmod.c
@@ -287,7 +287,7 @@ static __net_init int skbmod_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, skbmod_net_id);
 
-        return tc_action_net_init(tn, &act_skbmod_ops);
+        return tc_action_net_init(net, tn, &act_skbmod_ops);
 }
 
 static void __net_exit skbmod_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c
index 6d0debdc9b97..2f83a79f76aa 100644
--- a/net/sched/act_tunnel_key.c
+++ b/net/sched/act_tunnel_key.c
@@ -600,7 +600,7 @@ static __net_init int tunnel_key_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, tunnel_key_net_id);
 
-        return tc_action_net_init(tn, &act_tunnel_key_ops);
+        return tc_action_net_init(net, tn, &act_tunnel_key_ops);
 }
 
 static void __net_exit tunnel_key_exit_net(struct list_head *net_list)
diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
index a3c9eea1ee8a..287a30bf8930 100644
--- a/net/sched/act_vlan.c
+++ b/net/sched/act_vlan.c
@@ -334,7 +334,7 @@ static __net_init int vlan_init_net(struct net *net)
 {
         struct tc_action_net *tn = net_generic(net, vlan_net_id);
 
-        return tc_action_net_init(tn, &act_vlan_ops);
+        return tc_action_net_init(net, tn, &act_vlan_ops);
 }
 
 static void __net_exit vlan_exit_net(struct list_head *net_list)
diff --git a/net/sched/sch_cbs.c b/net/sched/sch_cbs.c
index 732e109c3055..810645b5c086 100644
--- a/net/sched/sch_cbs.c
+++ b/net/sched/sch_cbs.c
@@ -181,11 +181,6 @@ static struct sk_buff *cbs_dequeue_soft(struct Qdisc *sch)
         s64 credits;
         int len;
 
-        if (atomic64_read(&q->port_rate) == -1) {
-                WARN_ONCE(1, "cbs: dequeue() called with unknown port rate.");
-                return NULL;
-        }
-
         if (q->credits < 0) {
                 credits = timediff_to_credits(now - q->last, q->idleslope);
 
@@ -303,11 +298,19 @@ static int cbs_enable_offload(struct net_device *dev, struct cbs_sched_data *q,
 static void cbs_set_port_rate(struct net_device *dev, struct cbs_sched_data *q)
 {
         struct ethtool_link_ksettings ecmd;
+        int speed = SPEED_10;
         int port_rate = -1;
+        int err;
+
+        err = __ethtool_get_link_ksettings(dev, &ecmd);
+        if (err < 0)
+                goto skip;
+
+        if (ecmd.base.speed != SPEED_UNKNOWN)
+                speed = ecmd.base.speed;
 
-        if (!__ethtool_get_link_ksettings(dev, &ecmd) &&
-            ecmd.base.speed != SPEED_UNKNOWN)
-                port_rate = ecmd.base.speed * 1000 * BYTES_PER_KBIT;
+skip:
+        port_rate = speed * 1000 * BYTES_PER_KBIT;
 
         atomic64_set(&q->port_rate, port_rate);
         netdev_dbg(dev, "cbs: set %s's port_rate to: %lld, linkspeed: %d\n",
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 11c03cf4aa74..137db1cbde85 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -624,8 +624,12 @@ static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc *qdisc,
 
         err = skb_array_produce(q, skb);
 
-        if (unlikely(err))
-                return qdisc_drop_cpu(skb, qdisc, to_free);
+        if (unlikely(err)) {
+                if (qdisc_is_percpu_stats(qdisc))
+                        return qdisc_drop_cpu(skb, qdisc, to_free);
+                else
+                        return qdisc_drop(skb, qdisc, to_free);
+        }
 
         qdisc_update_stats_at_enqueue(qdisc, pkt_len);
         return NET_XMIT_SUCCESS;
@@ -688,11 +692,14 @@ static void pfifo_fast_reset(struct Qdisc *qdisc)
                         kfree_skb(skb);
         }
 
-        for_each_possible_cpu(i) {
-                struct gnet_stats_queue *q = per_cpu_ptr(qdisc->cpu_qstats, i);
+        if (qdisc_is_percpu_stats(qdisc)) {
+                for_each_possible_cpu(i) {
+                        struct gnet_stats_queue *q;
 
-                q->backlog = 0;
-                q->qlen = 0;
+                        q = per_cpu_ptr(qdisc->cpu_qstats, i);
+                        q->backlog = 0;
+                        q->qlen = 0;
+                }
         }
 }
 
diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index c39db507ba3f..8d8bc2ec5cd6 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -477,11 +477,6 @@ static struct sk_buff *taprio_dequeue(struct Qdisc *sch)
         u32 gate_mask;
         int i;
 
-        if (atomic64_read(&q->picos_per_byte) == -1) {
-                WARN_ONCE(1, "taprio: dequeue() called with unknown picos per byte.");
-                return NULL;
-        }
-
         rcu_read_lock();
         entry = rcu_dereference(q->current_entry);
         /* if there's no entry, it means that the schedule didn't
@@ -958,12 +953,20 @@ static void taprio_set_picos_per_byte(struct net_device *dev,
                                       struct taprio_sched *q)
 {
         struct ethtool_link_ksettings ecmd;
-        int picos_per_byte = -1;
+        int speed = SPEED_10;
+        int picos_per_byte;
+        int err;
 
-        if (!__ethtool_get_link_ksettings(dev, &ecmd) &&
-            ecmd.base.speed != SPEED_UNKNOWN)
-                picos_per_byte = div64_s64(NSEC_PER_SEC * 1000LL * 8,
-                                           ecmd.base.speed * 1000 * 1000);
+        err = __ethtool_get_link_ksettings(dev, &ecmd);
+        if (err < 0)
+                goto skip;
+
+        if (ecmd.base.speed != SPEED_UNKNOWN)
+                speed = ecmd.base.speed;
+
+skip:
+        picos_per_byte = div64_s64(NSEC_PER_SEC * 1000LL * 8,
+                                   speed * 1000 * 1000);
 
         atomic64_set(&q->picos_per_byte, picos_per_byte);
         netdev_dbg(dev, "taprio: set %s's picos_per_byte to: %lld, linkspeed: %d\n",
@@ -1195,7 +1198,8 @@ unlock:
         spin_unlock_bh(qdisc_lock(sch));
 
 free_sched:
-        kfree(new_admin);
+        if (new_admin)
+                call_rcu(&new_admin->rcu, taprio_free_sched_cb);
 
         return err;
 }
@@ -1248,6 +1252,10 @@ static int taprio_init(struct Qdisc *sch, struct nlattr *opt,
          */
         q->clockid = -1;
 
+        spin_lock(&taprio_list_lock);
+        list_add(&q->taprio_list, &taprio_list);
+        spin_unlock(&taprio_list_lock);
+
         if (sch->parent != TC_H_ROOT)
                 return -EOPNOTSUPP;
 
@@ -1265,10 +1273,6 @@ static int taprio_init(struct Qdisc *sch, struct nlattr *opt,
         if (!opt)
                 return -EINVAL;
 
-        spin_lock(&taprio_list_lock);
-        list_add(&q->taprio_list, &taprio_list);
-        spin_unlock(&taprio_list_lock);
-
         for (i = 0; i < dev->num_tx_queues; i++) {
                 struct netdev_queue *dev_queue;
                 struct Qdisc *qdisc;
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index a554d6d15d1b..1cf5bb5b73c4 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -546,7 +546,7 @@ static void sctp_do_8_2_transport_strike(struct sctp_cmd_seq *commands,
          */
         if (net->sctp.pf_enable &&
            (transport->state == SCTP_ACTIVE) &&
-           (asoc->pf_retrans < transport->pathmaxrxt) &&
+           (transport->error_count < transport->pathmaxrxt) &&
            (transport->error_count > asoc->pf_retrans)) {
 
                 sctp_assoc_control_transport(asoc, transport,
diff --git a/net/sctp/stream.c b/net/sctp/stream.c
index 25946604af85..e83cdaa2ab76 100644
--- a/net/sctp/stream.c
+++ b/net/sctp/stream.c
@@ -316,6 +316,7 @@ int sctp_send_reset_streams(struct sctp_association *asoc,
                 nstr_list[i] = htons(str_list[i]);
 
         if (out && !sctp_stream_outq_is_empty(stream, str_nums, nstr_list)) {
+                kfree(nstr_list);
                 retval = -EAGAIN;
                 goto out;
         }
diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c
index f0de323d15d6..6c8f09c1ce51 100644
--- a/net/smc/smc_tx.c
+++ b/net/smc/smc_tx.c
@@ -76,13 +76,11 @@ static int smc_tx_wait(struct smc_sock *smc, int flags)
         DEFINE_WAIT_FUNC(wait, woken_wake_function);
         struct smc_connection *conn = &smc->conn;
         struct sock *sk = &smc->sk;
-        bool noblock;
         long timeo;
         int rc = 0;
 
         /* similar to sk_stream_wait_memory */
         timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);
-        noblock = timeo ? false : true;
         add_wait_queue(sk_sleep(sk), &wait);
         while (1) {
                 sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
@@ -97,8 +95,8 @@ static int smc_tx_wait(struct smc_sock *smc, int flags)
                         break;
                 }
                 if (!timeo) {
-                        if (noblock)
-                                set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
+                        /* ensure EPOLLOUT is subsequently generated */
+                        set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
                         rc = -EAGAIN;
                         break;
                 }
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index d8679b6027e9..a07b516e503a 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1970,6 +1970,7 @@ call_bind(struct rpc_task *task)
 static void
 call_bind_status(struct rpc_task *task)
 {
+        struct rpc_xprt *xprt = task->tk_rqstp->rq_xprt;
         int status = -EIO;
 
         if (rpc_task_transmitted(task)) {
@@ -1977,14 +1978,15 @@ call_bind_status(struct rpc_task *task)
                 return;
         }
 
-        if (task->tk_status >= 0) {
-                dprint_status(task);
+        dprint_status(task);
+        trace_rpc_bind_status(task);
+        if (task->tk_status >= 0)
+                goto out_next;
+        if (xprt_bound(xprt)) {
                 task->tk_status = 0;
-                task->tk_action = call_connect;
-                return;
+                goto out_next;
         }
 
-        trace_rpc_bind_status(task);
         switch (task->tk_status) {
         case -ENOMEM:
                 dprintk("RPC: %5u rpcbind out of memory\n", task->tk_pid);
@@ -2003,6 +2005,9 @@ call_bind_status(struct rpc_task *task)
                 task->tk_rebind_retry--;
                 rpc_delay(task, 3*HZ);
                 goto retry_timeout;
+        case -ENOBUFS:
+                rpc_delay(task, HZ >> 2);
+                goto retry_timeout;
         case -EAGAIN:
                 goto retry_timeout;
         case -ETIMEDOUT:
@@ -2026,7 +2031,6 @@ call_bind_status(struct rpc_task *task)
         case -ENETDOWN:
         case -EHOSTUNREACH:
         case -ENETUNREACH:
-        case -ENOBUFS:
         case -EPIPE:
                 dprintk("RPC: %5u remote rpcbind unreachable: %d\n",
                                 task->tk_pid, task->tk_status);
@@ -2043,7 +2047,9 @@ call_bind_status(struct rpc_task *task)
 
         rpc_call_rpcerror(task, status);
         return;
-
+out_next:
+        task->tk_action = call_connect;
+        return;
 retry_timeout:
         task->tk_status = 0;
         task->tk_action = call_bind;
@@ -2090,6 +2096,7 @@ call_connect(struct rpc_task *task)
 static void
 call_connect_status(struct rpc_task *task)
 {
+        struct rpc_xprt *xprt = task->tk_rqstp->rq_xprt;
         struct rpc_clnt *clnt = task->tk_client;
         int status = task->tk_status;
 
@@ -2099,8 +2106,17 @@ call_connect_status(struct rpc_task *task)
         }
 
         dprint_status(task);
-
         trace_rpc_connect_status(task);
+
+        if (task->tk_status == 0) {
+                clnt->cl_stats->netreconn++;
+                goto out_next;
+        }
+        if (xprt_connected(xprt)) {
+                task->tk_status = 0;
+                goto out_next;
+        }
+
         task->tk_status = 0;
         switch (status) {
         case -ECONNREFUSED:
@@ -2117,8 +2133,6 @@ call_connect_status(struct rpc_task *task)
         case -ENETDOWN:
         case -ENETUNREACH:
         case -EHOSTUNREACH:
-        case -EADDRINUSE:
-        case -ENOBUFS:
         case -EPIPE:
                 xprt_conditional_disconnect(task->tk_rqstp->rq_xprt,
                                             task->tk_rqstp->rq_connect_cookie);
@@ -2127,17 +2141,20 @@ call_connect_status(struct rpc_task *task)
                 /* retry with existing socket, after a delay */
                 rpc_delay(task, 3*HZ);
                 /* fall through */
+        case -EADDRINUSE:
         case -ENOTCONN:
         case -EAGAIN:
         case -ETIMEDOUT:
                 goto out_retry;
-        case 0:
-                clnt->cl_stats->netreconn++;
-                task->tk_action = call_transmit;
-                return;
+        case -ENOBUFS:
+                rpc_delay(task, HZ >> 2);
+                goto out_retry;
         }
         rpc_call_rpcerror(task, status);
         return;
+out_next:
+        task->tk_action = call_transmit;
+        return;
 out_retry:
         /* Check for timeouts before looping back to call_bind */
         task->tk_action = call_bind;
@@ -2365,7 +2382,7 @@ call_status(struct rpc_task *task)
         case -ECONNABORTED:
         case -ENOTCONN:
                 rpc_force_rebind(clnt);
-                /* fall through */
+                break;
         case -EADDRINUSE:
                 rpc_delay(task, 3*HZ);
                 /* fall through */
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 783748dc5e6f..2e71f5455c6c 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1408,13 +1408,6 @@ xprt_request_transmit(struct rpc_rqst *req, struct rpc_task *snd_task)
                         status = -EBADMSG;
                         goto out_dequeue;
                 }
-                if (task->tk_ops->rpc_call_prepare_transmit) {
-                        task->tk_ops->rpc_call_prepare_transmit(task,
-                                        task->tk_calldata);
-                        status = task->tk_status;
-                        if (status < 0)
-                                goto out_dequeue;
-                }
                 if (RPC_SIGNALLED(task)) {
                         status = -ERESTARTSYS;
                         goto out_dequeue;
diff --git a/net/tipc/addr.c b/net/tipc/addr.c
index b88d48d00913..0f1eaed1bd1b 100644
--- a/net/tipc/addr.c
+++ b/net/tipc/addr.c
@@ -75,6 +75,7 @@ void tipc_set_node_addr(struct net *net, u32 addr)
                 tipc_set_node_id(net, node_id);
         }
         tn->trial_addr = addr;
+        tn->addr_trial_end = jiffies;
         pr_info("32-bit node address hash set to %x\n", addr);
 }
 
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 66d3a07bc571..c2c5c53cad22 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -106,8 +106,6 @@ struct tipc_stats {
  * @transmitq: queue for sent, non-acked messages
  * @backlogq: queue for messages waiting to be sent
  * @snt_nxt: next sequence number to use for outbound messages
- * @prev_from: sequence number of most previous retransmission request
- * @stale_limit: time when repeated identical retransmits must force link reset
  * @ackers: # of peers that needs to ack each packet before it can be released
  * @acked: # last packet acked by a certain peer. Used for broadcast.
  * @rcv_nxt: next sequence number to expect for inbound messages
@@ -164,9 +162,7 @@ struct tipc_link {
                 u16 limit;
         } backlog[5];
         u16 snd_nxt;
-        u16 prev_from;
         u16 window;
-        unsigned long stale_limit;
 
         /* Reception */
         u16 rcv_nxt;
@@ -1044,47 +1040,53 @@ static void tipc_link_advance_backlog(struct tipc_link *l,
  * link_retransmit_failure() - Detect repeated retransmit failures
  * @l: tipc link sender
  * @r: tipc link receiver (= l in case of unicast)
- * @from: seqno of the 1st packet in retransmit request
  * @rc: returned code
  *
  * Return: true if the repeated retransmit failures happens, otherwise
  * false
  */
 static bool link_retransmit_failure(struct tipc_link *l, struct tipc_link *r,
-                                    u16 from, int *rc)
+                                    int *rc)
 {
         struct sk_buff *skb = skb_peek(&l->transmq);
         struct tipc_msg *hdr;
 
         if (!skb)
                 return false;
-        hdr = buf_msg(skb);
 
-        /* Detect repeated retransmit failures on same packet */
-        if (r->prev_from != from) {
-                r->prev_from = from;
-                r->stale_limit = jiffies + msecs_to_jiffies(r->tolerance);
-        } else if (time_after(jiffies, r->stale_limit)) {
-                pr_warn("Retransmission failure on link <%s>\n", l->name);
-                link_print(l, "State of link ");
-                pr_info("Failed msg: usr %u, typ %u, len %u, err %u\n",
-                        msg_user(hdr), msg_type(hdr), msg_size(hdr),
-                        msg_errcode(hdr));
-                pr_info("sqno %u, prev: %x, src: %x\n",
-                        msg_seqno(hdr), msg_prevnode(hdr), msg_orignode(hdr));
-
-                trace_tipc_list_dump(&l->transmq, true, "retrans failure!");
-                trace_tipc_link_dump(l, TIPC_DUMP_NONE, "retrans failure!");
-                trace_tipc_link_dump(r, TIPC_DUMP_NONE, "retrans failure!");
+        if (!TIPC_SKB_CB(skb)->retr_cnt)
+                return false;
 
-                if (link_is_bc_sndlink(l))
-                        *rc = TIPC_LINK_DOWN_EVT;
+        if (!time_after(jiffies, TIPC_SKB_CB(skb)->retr_stamp +
+                        msecs_to_jiffies(r->tolerance)))
+                return false;
+
+        hdr = buf_msg(skb);
+        if (link_is_bc_sndlink(l) && !less(r->acked, msg_seqno(hdr)))
+                return false;
 
+        pr_warn("Retransmission failure on link <%s>\n", l->name);
+        link_print(l, "State of link ");
+        pr_info("Failed msg: usr %u, typ %u, len %u, err %u\n",
+                msg_user(hdr), msg_type(hdr), msg_size(hdr), msg_errcode(hdr));
+        pr_info("sqno %u, prev: %x, dest: %x\n",
+                msg_seqno(hdr), msg_prevnode(hdr), msg_destnode(hdr));
+        pr_info("retr_stamp %d, retr_cnt %d\n",
+                jiffies_to_msecs(TIPC_SKB_CB(skb)->retr_stamp),
+                TIPC_SKB_CB(skb)->retr_cnt);
+
+        trace_tipc_list_dump(&l->transmq, true, "retrans failure!");
+        trace_tipc_link_dump(l, TIPC_DUMP_NONE, "retrans failure!");
+        trace_tipc_link_dump(r, TIPC_DUMP_NONE, "retrans failure!");
+
+        if (link_is_bc_sndlink(l)) {
+                r->state = LINK_RESET;
+                *rc = TIPC_LINK_DOWN_EVT;
+        } else {
                 *rc = tipc_link_fsm_evt(l, LINK_FAILURE_EVT);
-                return true;
         }
 
-        return false;
+        return true;
 }
 
 /* tipc_link_bc_retrans() - retransmit zero or more packets
@@ -1110,7 +1112,7 @@ static int tipc_link_bc_retrans(struct tipc_link *l, struct tipc_link *r,
 
         trace_tipc_link_retrans(r, from, to, &l->transmq);
 
-        if (link_retransmit_failure(l, r, from, &rc))
+        if (link_retransmit_failure(l, r, &rc))
                 return rc;
 
         skb_queue_walk(&l->transmq, skb) {
@@ -1119,11 +1121,10 @@ static int tipc_link_bc_retrans(struct tipc_link *l, struct tipc_link *r,
                         continue;
                 if (more(msg_seqno(hdr), to))
                         break;
-                if (link_is_bc_sndlink(l)) {
-                        if (time_before(jiffies, TIPC_SKB_CB(skb)->nxt_retr))
-                                continue;
-                        TIPC_SKB_CB(skb)->nxt_retr = TIPC_BC_RETR_LIM;
-                }
+
+                if (time_before(jiffies, TIPC_SKB_CB(skb)->nxt_retr))
+                        continue;
+                TIPC_SKB_CB(skb)->nxt_retr = TIPC_BC_RETR_LIM;
                 _skb = __pskb_copy(skb, LL_MAX_HEADER + MIN_H_SIZE, GFP_ATOMIC);
                 if (!_skb)
                         return 0;
@@ -1133,6 +1134,10 @@ static int tipc_link_bc_retrans(struct tipc_link *l, struct tipc_link *r,
                 _skb->priority = TC_PRIO_CONTROL;
                 __skb_queue_tail(xmitq, _skb);
                 l->stats.retransmitted++;
+
+                /* Increase actual retrans counter & mark first time */
+                if (!TIPC_SKB_CB(skb)->retr_cnt++)
+                        TIPC_SKB_CB(skb)->retr_stamp = jiffies;
         }
         return 0;
 }
@@ -1357,12 +1362,10 @@ static int tipc_link_advance_transmq(struct tipc_link *l, u16 acked, u16 gap,
         struct tipc_msg *hdr;
         u16 bc_ack = l->bc_rcvlink->rcv_nxt - 1;
         u16 ack = l->rcv_nxt - 1;
+        bool passed = false;
         u16 seqno, n = 0;
         int rc = 0;
 
-        if (gap && link_retransmit_failure(l, l, acked + 1, &rc))
-                return rc;
-
         skb_queue_walk_safe(&l->transmq, skb, tmp) {
                 seqno = buf_seqno(skb);
 
@@ -1372,12 +1375,17 @@ next_gap_ack:
                         __skb_unlink(skb, &l->transmq);
                         kfree_skb(skb);
                 } else if (less_eq(seqno, acked + gap)) {
-                        /* retransmit skb */
+                        /* First, check if repeated retrans failures occurs? */
+                        if (!passed && link_retransmit_failure(l, l, &rc))
+                                return rc;
+                        passed = true;
+
+                        /* retransmit skb if unrestricted*/
                         if (time_before(jiffies, TIPC_SKB_CB(skb)->nxt_retr))
                                 continue;
                         TIPC_SKB_CB(skb)->nxt_retr = TIPC_UC_RETR_TIME;
-
-                        _skb = __pskb_copy(skb, MIN_H_SIZE, GFP_ATOMIC);
+                        _skb = __pskb_copy(skb, LL_MAX_HEADER + MIN_H_SIZE,
+                                           GFP_ATOMIC);
                         if (!_skb)
                                 continue;
                         hdr = buf_msg(_skb);
@@ -1386,6 +1394,10 @@ next_gap_ack:
                         _skb->priority = TC_PRIO_CONTROL;
                         __skb_queue_tail(xmitq, _skb);
                         l->stats.retransmitted++;
+
+                        /* Increase actual retrans counter & mark first time */
+                        if (!TIPC_SKB_CB(skb)->retr_cnt++)
+                                TIPC_SKB_CB(skb)->retr_stamp = jiffies;
                 } else {
                         /* retry with Gap ACK blocks if any */
                         if (!ga || n >= ga->gack_cnt)
@@ -2577,7 +2589,7 @@ int tipc_link_dump(struct tipc_link *l, u16 dqueues, char *buf)
         i += scnprintf(buf + i, sz - i, " %x", l->peer_caps);
         i += scnprintf(buf + i, sz - i, " %u", l->silent_intv_cnt);
         i += scnprintf(buf + i, sz - i, " %u", l->rst_cnt);
-        i += scnprintf(buf + i, sz - i, " %u", l->prev_from);
+        i += scnprintf(buf + i, sz - i, " %u", 0);
         i += scnprintf(buf + i, sz - i, " %u", 0);
         i += scnprintf(buf + i, sz - i, " %u", l->acked);
 
diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index da509f0eb9ca..d7ebc9e955f6 100644
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -102,13 +102,15 @@ struct plist;
 #define TIPC_MEDIA_INFO_OFFSET  5
 
 struct tipc_skb_cb {
-        u32 bytes_read;
-        u32 orig_member;
         struct sk_buff *tail;
         unsigned long nxt_retr;
-        bool validated;
+        unsigned long retr_stamp;
+        u32 bytes_read;
+        u32 orig_member;
         u16 chain_imp;
         u16 ackers;
+        u16 retr_cnt;
+        bool validated;
 };
 
 #define TIPC_SKB_CB(__skb) ((struct tipc_skb_cb *)&((__skb)->cb[0]))
diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index 7c0b2b778703..43922d86e510 100644
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -373,9 +373,9 @@ static int tls_push_data(struct sock *sk,
         struct tls_context *tls_ctx = tls_get_ctx(sk);
         struct tls_prot_info *prot = &tls_ctx->prot_info;
         struct tls_offload_context_tx *ctx = tls_offload_ctx_tx(tls_ctx);
-        int tls_push_record_flags = flags | MSG_SENDPAGE_NOTLAST;
         int more = flags & (MSG_SENDPAGE_NOTLAST | MSG_MORE);
         struct tls_record_info *record = ctx->open_record;
+        int tls_push_record_flags;
         struct page_frag *pfrag;
         size_t orig_size = size;
         u32 max_open_record_len;
@@ -390,6 +390,9 @@ static int tls_push_data(struct sock *sk,
         if (sk->sk_err)
                 return -sk->sk_err;
 
+        flags |= MSG_SENDPAGE_DECRYPTED;
+        tls_push_record_flags = flags | MSG_SENDPAGE_NOTLAST;
+
         timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);
         if (tls_is_partially_sent_record(tls_ctx)) {
                 rc = tls_push_partial_record(sk, tls_ctx, flags);
@@ -576,7 +579,9 @@ void tls_device_write_space(struct sock *sk, struct tls_context *ctx)
                 gfp_t sk_allocation = sk->sk_allocation;
 
                 sk->sk_allocation = GFP_ATOMIC;
-                tls_push_partial_record(sk, ctx, MSG_DONTWAIT | MSG_NOSIGNAL);
+                tls_push_partial_record(sk, ctx,
+                                        MSG_DONTWAIT | MSG_NOSIGNAL |
+                                        MSG_SENDPAGE_DECRYPTED);
                 sk->sk_allocation = sk_allocation;
         }
 }
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index 9cbbae606ced..43252a801c3f 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -308,6 +308,8 @@ static void tls_sk_proto_close(struct sock *sk, long timeout)
         if (free_ctx)
                 icsk->icsk_ulp_data = NULL;
         sk->sk_prot = ctx->sk_proto;
+        if (sk->sk_write_space == tls_write_space)
+                sk->sk_write_space = ctx->sk_write_space;
         write_unlock_bh(&sk->sk_callback_lock);
         release_sock(sk);
         if (ctx->tx_conf == TLS_SW)
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 4831ad745f91..327479ce69f5 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2788,7 +2788,7 @@ static void reg_process_pending_hints(void)
 
         /* When last_request->processed becomes true this will be rescheduled */
         if (lr && !lr->processed) {
-                reg_process_hint(lr);
+                pr_debug("Pending regulatory request, waiting for it to be processed...\n");
                 return;
         }
 
diff --git a/net/wireless/util.c b/net/wireless/util.c
index d0e35b7b9e35..e74837824cea 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -233,25 +233,30 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev,
 
         switch (params->cipher) {
         case WLAN_CIPHER_SUITE_TKIP:
+                /* Extended Key ID can only be used with CCMP/GCMP ciphers */
+                if ((pairwise && key_idx) ||
+                    params->mode != NL80211_KEY_RX_TX)
+                        return -EINVAL;
+                break;
         case WLAN_CIPHER_SUITE_CCMP:
         case WLAN_CIPHER_SUITE_CCMP_256:
         case WLAN_CIPHER_SUITE_GCMP:
         case WLAN_CIPHER_SUITE_GCMP_256:
-                /* IEEE802.11-2016 allows only 0 and - when using Extended Key
-                 * ID - 1 as index for pairwise keys.
+                /* IEEE802.11-2016 allows only 0 and - when supporting
+                 * Extended Key ID - 1 as index for pairwise keys.
                  * @NL80211_KEY_NO_TX is only allowed for pairwise keys when
                  * the driver supports Extended Key ID.
                  * @NL80211_KEY_SET_TX can't be set when installing and
                  * validating a key.
                  */
-                if (params->mode == NL80211_KEY_NO_TX) {
-                        if (!wiphy_ext_feature_isset(&rdev->wiphy,
-                                                     NL80211_EXT_FEATURE_EXT_KEY_ID))
-                                return -EINVAL;
-                        else if (!pairwise || key_idx < 0 || key_idx > 1)
+                if ((params->mode == NL80211_KEY_NO_TX && !pairwise) ||
+                    params->mode == NL80211_KEY_SET_TX)
+                        return -EINVAL;
+                if (wiphy_ext_feature_isset(&rdev->wiphy,
+                                            NL80211_EXT_FEATURE_EXT_KEY_ID)) {
+                        if (pairwise && (key_idx < 0 || key_idx > 1))
                                 return -EINVAL;
-                } else if ((pairwise && key_idx) ||
-                           params->mode == NL80211_KEY_SET_TX) {
+                } else if (pairwise && key_idx) {
                         return -EINVAL;
                 }
                 break;
diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c
index 83de74ca729a..688aac7a6943 100644
--- a/net/xdp/xdp_umem.c
+++ b/net/xdp/xdp_umem.c
@@ -365,7 +365,7 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)
         umem->pages = kcalloc(umem->npgs, sizeof(*umem->pages), GFP_KERNEL);
         if (!umem->pages) {
                 err = -ENOMEM;
-                goto out_account;
+                goto out_pin;
         }
 
         for (i = 0; i < umem->npgs; i++)
@@ -373,6 +373,8 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)
 
         return 0;
 
+out_pin:
+        xdp_umem_unpin_pages(umem);
 out_account:
         xdp_umem_unaccount_pages(umem);
         return err;
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 8ca637a72697..ec94f5795ea4 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -3269,7 +3269,7 @@ decode_session4(struct sk_buff *skb, struct flowi *fl, bool reverse)
         struct flowi4 *fl4 = &fl->u.ip4;
         int oif = 0;
 
-        if (skb_dst(skb))
+        if (skb_dst(skb) && skb_dst(skb)->dev)
                 oif = skb_dst(skb)->dev->ifindex;
 
         memset(fl4, 0, sizeof(struct flowi4));
@@ -3387,7 +3387,7 @@ decode_session6(struct sk_buff *skb, struct flowi *fl, bool reverse)
 
         nexthdr = nh[nhoff];
 
-        if (skb_dst(skb))
+        if (skb_dst(skb) && skb_dst(skb)->dev)
                 oif = skb_dst(skb)->dev->ifindex;
 
         memset(fl6, 0, sizeof(struct flowi6));
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index 7325f382dbf4..957b9e3e1492 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -595,7 +595,7 @@ struct key *request_key_and_link(struct key_type *type,
 
         key = check_cached_key(&ctx);
         if (key)
-                return key;
+                goto error_free;
 
         /* search all the process keyrings for a key */
         rcu_read_lock();
diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c
index e73ec040e250..ecba39c93fd9 100644
--- a/security/keys/request_key_auth.c
+++ b/security/keys/request_key_auth.c
@@ -66,6 +66,9 @@ static void request_key_auth_describe(const struct key *key,
 {
         struct request_key_auth *rka = dereference_key_rcu(key);
 
+        if (!rka)
+                return;
+
         seq_puts(m, "key:");
         seq_puts(m, key->description);
         if (key_is_positive(key))
@@ -83,6 +86,9 @@ static long request_key_auth_read(const struct key *key,
         size_t datalen;
         long ret;
 
+        if (!rka)
+                return -EKEYREVOKED;
+
         datalen = rka->callout_len;
         ret = datalen;
 
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index 7737b2670064..6d9592f0ae1d 100644
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -1835,8 +1835,7 @@ static int snd_seq_ioctl_get_client_pool(struct snd_seq_client *client,
         if (cptr->type == USER_CLIENT) {
                 info->input_pool = cptr->data.user.fifo_pool_size;
                 info->input_free = info->input_pool;
-                if (cptr->data.user.fifo)
-                        info->input_free = snd_seq_unused_cells(cptr->data.user.fifo->pool);
+                info->input_free = snd_seq_fifo_unused_cells(cptr->data.user.fifo);
         } else {
                 info->input_pool = 0;
                 info->input_free = 0;
diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c
index ea69261f269a..eaaa8b5830bb 100644
--- a/sound/core/seq/seq_fifo.c
+++ b/sound/core/seq/seq_fifo.c
@@ -263,3 +263,20 @@ int snd_seq_fifo_resize(struct snd_seq_fifo *f, int poolsize)
 
         return 0;
 }
+
+/* get the number of unused cells safely */
+int snd_seq_fifo_unused_cells(struct snd_seq_fifo *f)
+{
+        unsigned long flags;
+        int cells;
+
+        if (!f)
+                return 0;
+
+        snd_use_lock_use(&f->use_lock);
+        spin_lock_irqsave(&f->lock, flags);
+        cells = snd_seq_unused_cells(f->pool);
+        spin_unlock_irqrestore(&f->lock, flags);
+        snd_use_lock_free(&f->use_lock);
+        return cells;
+}
diff --git a/sound/core/seq/seq_fifo.h b/sound/core/seq/seq_fifo.h
index edc68743943d..b56a7b897c9c 100644
--- a/sound/core/seq/seq_fifo.h
+++ b/sound/core/seq/seq_fifo.h
@@ -53,5 +53,7 @@ int snd_seq_fifo_poll_wait(struct snd_seq_fifo *f, struct file *file, poll_table
 /* resize pool in fifo */
 int snd_seq_fifo_resize(struct snd_seq_fifo *f, int poolsize);
 
+/* get the number of unused cells safely */
+int snd_seq_fifo_unused_cells(struct snd_seq_fifo *f);
 
 #endif
diff --git a/sound/firewire/oxfw/oxfw-pcm.c b/sound/firewire/oxfw/oxfw-pcm.c
index 9ea39348cdf5..7c6d1c277d4d 100644
--- a/sound/firewire/oxfw/oxfw-pcm.c
+++ b/sound/firewire/oxfw/oxfw-pcm.c
@@ -248,7 +248,7 @@ static int pcm_playback_hw_params(struct snd_pcm_substream *substream,
                 unsigned int channels = params_channels(hw_params);
 
                 mutex_lock(&oxfw->mutex);
-                err = snd_oxfw_stream_reserve_duplex(oxfw, &oxfw->tx_stream,
+                err = snd_oxfw_stream_reserve_duplex(oxfw, &oxfw->rx_stream,
                                                      rate, channels);
                 if (err >= 0)
                         ++oxfw->substreams_count;
diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
index 92390d457567..18e6546b4467 100644
--- a/sound/pci/hda/hda_auto_parser.c
+++ b/sound/pci/hda/hda_auto_parser.c
@@ -824,6 +824,8 @@ static void apply_fixup(struct hda_codec *codec, int id, int action, int depth)
         while (id >= 0) {
                 const struct hda_fixup *fix = codec->fixup_list + id;
 
+                if (++depth > 10)
+                        break;
                 if (fix->chained_before)
                         apply_fixup(codec, fix->chain_id, action, depth + 1);
 
@@ -863,8 +865,6 @@ static void apply_fixup(struct hda_codec *codec, int id, int action, int depth)
                 }
                 if (!fix->chained || fix->chained_before)
                         break;
-                if (++depth > 10)
-                        break;
                 id = fix->chain_id;
         }
 }
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 5bf24fb819d2..10d502328b76 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -6009,7 +6009,8 @@ int snd_hda_gen_init(struct hda_codec *codec)
         if (spec->init_hook)
                 spec->init_hook(codec);
 
-        snd_hda_apply_verbs(codec);
+        if (!spec->skip_verbs)
+                snd_hda_apply_verbs(codec);
 
         init_multi_out(codec);
         init_extra_out(codec);
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h
index 5f199dcb0d18..fb9f1a90238b 100644
--- a/sound/pci/hda/hda_generic.h
+++ b/sound/pci/hda/hda_generic.h
@@ -243,6 +243,7 @@ struct hda_gen_spec {
         unsigned int indep_hp_enabled:1; /* independent HP enabled */
         unsigned int have_aamix_ctl:1;
         unsigned int hp_mic_jack_modes:1;
+        unsigned int skip_verbs:1; /* don't apply verbs at snd_hda_gen_init() */
 
         /* additional mute flags (only effective with auto_mute_via_amp=1) */
         u64 mute_bits;
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 0d51823d7270..6d1fb7c11f17 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -1175,6 +1175,7 @@ static const struct snd_pci_quirk ca0132_quirks[] = {
         SND_PCI_QUIRK(0x1028, 0x0708, "Alienware 15 R2 2016", QUIRK_ALIENWARE),
         SND_PCI_QUIRK(0x1102, 0x0010, "Sound Blaster Z", QUIRK_SBZ),
         SND_PCI_QUIRK(0x1102, 0x0023, "Sound Blaster Z", QUIRK_SBZ),
+        SND_PCI_QUIRK(0x1102, 0x0027, "Sound Blaster Z", QUIRK_SBZ),
         SND_PCI_QUIRK(0x1102, 0x0033, "Sound Blaster ZxR", QUIRK_SBZ),
         SND_PCI_QUIRK(0x1458, 0xA016, "Recon3Di", QUIRK_R3DI),
         SND_PCI_QUIRK(0x1458, 0xA026, "Gigabyte G1.Sniper Z97", QUIRK_R3DI),
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 14298ef45b21..968d3caab6ac 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -611,18 +611,20 @@ static void cxt_fixup_hp_gate_mic_jack(struct hda_codec *codec,
 
 /* update LED status via GPIO */
 static void cxt_update_gpio_led(struct hda_codec *codec, unsigned int mask,
-                                bool enabled)
+                                bool led_on)
 {
         struct conexant_spec *spec = codec->spec;
         unsigned int oldval = spec->gpio_led;
 
         if (spec->mute_led_polarity)
-                enabled = !enabled;
+                led_on = !led_on;
 
-        if (enabled)
-                spec->gpio_led &= ~mask;
-        else
+        if (led_on)
                 spec->gpio_led |= mask;
+        else
+                spec->gpio_led &= ~mask;
+        codec_dbg(codec, "mask:%d enabled:%d gpio_led:%d\n",
+                        mask, led_on, spec->gpio_led);
         if (spec->gpio_led != oldval)
                 snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,
                                     spec->gpio_led);
@@ -633,8 +635,8 @@ static void cxt_fixup_gpio_mute_hook(void *private_data, int enabled)
 {
         struct hda_codec *codec = private_data;
         struct conexant_spec *spec = codec->spec;
-
-        cxt_update_gpio_led(codec, spec->gpio_mute_led_mask, enabled);
+        /* muted -> LED on */
+        cxt_update_gpio_led(codec, spec->gpio_mute_led_mask, !enabled);
 }
 
 /* turn on/off mic-mute LED via GPIO per capture hook */
@@ -656,7 +658,6 @@ static void cxt_fixup_mute_led_gpio(struct hda_codec *codec,
                 { 0x01, AC_VERB_SET_GPIO_DIRECTION, 0x03 },
                 {}
         };
-        codec_info(codec, "action: %d gpio_led: %d\n", action, spec->gpio_led);
 
         if (action == HDA_FIXUP_ACT_PRE_PROBE) {
                 spec->gen.vmaster_mute.hook = cxt_fixup_gpio_mute_hook;
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index e333b3e30e31..c1ddfd2fac52 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -837,9 +837,11 @@ static int alc_init(struct hda_codec *codec)
         if (spec->init_hook)
                 spec->init_hook(codec);
 
+        spec->gen.skip_verbs = 1; /* applied in below */
         snd_hda_gen_init(codec);
         alc_fix_pll(codec);
         alc_auto_init_amp(codec, spec->init_amp);
+        snd_hda_apply_verbs(codec); /* apply verbs here after own init */
 
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_INIT);
 
@@ -5797,6 +5799,7 @@ enum {
         ALC286_FIXUP_ACER_AIO_HEADSET_MIC,
         ALC256_FIXUP_ASUS_MIC_NO_PRESENCE,
         ALC299_FIXUP_PREDATOR_SPK,
+        ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC,
 };
 
 static const struct hda_fixup alc269_fixups[] = {
@@ -6837,6 +6840,16 @@ static const struct hda_fixup alc269_fixups[] = {
                         { }
                 }
         },
+        [ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x14, 0x411111f0 }, /* disable confusing internal speaker */
+                        { 0x19, 0x04a11150 }, /* use as headset mic, without its own jack detect */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
+        },
 };
 
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -6979,6 +6992,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x82c0, "HP G3 mini premium", ALC221_FIXUP_HP_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x103c, 0x83b9, "HP Spectre x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),
         SND_PCI_QUIRK(0x103c, 0x8497, "HP Envy x360", ALC269_FIXUP_HP_MUTE_LED_MIC3),
+        SND_PCI_QUIRK(0x103c, 0x84e7, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),
         SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
         SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
         SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
@@ -6995,6 +7009,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK),
         SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),
         SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),
+        SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC),
         SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
         SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", ALC256_FIXUP_ASUS_MIC),
         SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC),
@@ -7072,6 +7087,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x312a, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
         SND_PCI_QUIRK(0x17aa, 0x312f, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
         SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
+        SND_PCI_QUIRK(0x17aa, 0x3151, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC),
         SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
         SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),
         SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
@@ -8946,6 +8962,7 @@ static int patch_alc680(struct hda_codec *codec)
 static const struct hda_device_id snd_hda_id_realtek[] = {
         HDA_CODEC_ENTRY(0x10ec0215, "ALC215", patch_alc269),
         HDA_CODEC_ENTRY(0x10ec0221, "ALC221", patch_alc269),
+        HDA_CODEC_ENTRY(0x10ec0222, "ALC222", patch_alc269),
         HDA_CODEC_ENTRY(0x10ec0225, "ALC225", patch_alc269),
         HDA_CODEC_ENTRY(0x10ec0231, "ALC231", patch_alc269),
         HDA_CODEC_ENTRY(0x10ec0233, "ALC233", patch_alc269),
diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c
index 2c03e0f6bf72..f70211e6b174 100644
--- a/sound/usb/line6/pcm.c
+++ b/sound/usb/line6/pcm.c
@@ -550,6 +550,15 @@ int line6_init_pcm(struct usb_line6 *line6,
         line6pcm->volume_monitor = 255;
         line6pcm->line6 = line6;
 
+        spin_lock_init(&line6pcm->out.lock);
+        spin_lock_init(&line6pcm->in.lock);
+        line6pcm->impulse_period = LINE6_IMPULSE_DEFAULT_PERIOD;
+
+        line6->line6pcm = line6pcm;
+
+        pcm->private_data = line6pcm;
+        pcm->private_free = line6_cleanup_pcm;
+
         line6pcm->max_packet_size_in =
                 usb_maxpacket(line6->usbdev,
                         usb_rcvisocpipe(line6->usbdev, ep_read), 0);
@@ -562,15 +571,6 @@ int line6_init_pcm(struct usb_line6 *line6,
                 return -EINVAL;
         }
 
-        spin_lock_init(&line6pcm->out.lock);
-        spin_lock_init(&line6pcm->in.lock);
-        line6pcm->impulse_period = LINE6_IMPULSE_DEFAULT_PERIOD;
-
-        line6->line6pcm = line6pcm;
-
-        pcm->private_data = line6pcm;
-        pcm->private_free = line6_cleanup_pcm;
-
         err = line6_create_audio_out_urbs(line6pcm);
         if (err < 0)
                 return err;
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index b5927c3d5bc0..eceab19766db 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -739,7 +739,6 @@ static int uac_mixer_unit_get_channels(struct mixer_build *state,
                                        struct uac_mixer_unit_descriptor *desc)
 {
         int mu_channels;
-        void *c;
 
         if (desc->bLength < sizeof(*desc))
                 return -EINVAL;
@@ -762,13 +761,6 @@ static int uac_mixer_unit_get_channels(struct mixer_build *state,
                 break;
         }
 
-        if (!mu_channels)
-                return 0;
-
-        c = uac_mixer_unit_bmControls(desc, state->mixer->protocol);
-        if (c - (void *)desc + (mu_channels - 1) / 8 >= desc->bLength)
-                return 0; /* no bmControls -> skip */
-
         return mu_channels;
 }
 
@@ -2009,6 +2001,31 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid,
  * Mixer Unit
  */
 
+/* check whether the given in/out overflows bmMixerControls matrix */
+static bool mixer_bitmap_overflow(struct uac_mixer_unit_descriptor *desc,
+                                  int protocol, int num_ins, int num_outs)
+{
+        u8 *hdr = (u8 *)desc;
+        u8 *c = uac_mixer_unit_bmControls(desc, protocol);
+        size_t rest; /* remaining bytes after bmMixerControls */
+
+        switch (protocol) {
+        case UAC_VERSION_1:
+        default:
+                rest = 1; /* iMixer */
+                break;
+        case UAC_VERSION_2:
+                rest = 2; /* bmControls + iMixer */
+                break;
+        case UAC_VERSION_3:
+                rest = 6; /* bmControls + wMixerDescrStr */
+                break;
+        }
+
+        /* overflow? */
+        return c + (num_ins * num_outs + 7) / 8 + rest > hdr + hdr[0];
+}
+
 /*
  * build a mixer unit control
  *
@@ -2137,6 +2154,9 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid,
                 if (err < 0)
                         return err;
                 num_ins += iterm.channels;
+                if (mixer_bitmap_overflow(desc, state->mixer->protocol,
+                                          num_ins, num_outs))
+                        break;
                 for (; ich < num_ins; ich++) {
                         int och, ich_has_controls = 0;
 
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 199fa157a411..27dcb3743690 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -1155,17 +1155,17 @@ void snd_emuusb_set_samplerate(struct snd_usb_audio *chip,
 {
         struct usb_mixer_interface *mixer;
         struct usb_mixer_elem_info *cval;
-        int unitid = 12; /* SamleRate ExtensionUnit ID */
+        int unitid = 12; /* SampleRate ExtensionUnit ID */
 
         list_for_each_entry(mixer, &chip->mixer_list, list) {
-                cval = mixer_elem_list_to_info(mixer->id_elems[unitid]);
-                if (cval) {
+                if (mixer->id_elems[unitid]) {
+                        cval = mixer_elem_list_to_info(mixer->id_elems[unitid]);
                         snd_usb_mixer_set_ctl_value(cval, UAC_SET_CUR,
                                                     cval->control << 8,
                                                     samplerate_id);
                         snd_usb_mixer_notify_id(mixer, unitid);
+                        break;
                 }
-                break;
         }
 }
 
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 75b96929f76c..e4bbf79de956 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -339,6 +339,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,
                 ep = 0x81;
                 ifnum = 2;
                 goto add_sync_ep_from_ifnum;
+        case USB_ID(0x1397, 0x0001): /* Behringer UFX1604 */
         case USB_ID(0x1397, 0x0002): /* Behringer UFX1204 */
                 ep = 0x81;
                 ifnum = 1;
diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c
index 5215e0870bcb..6a71324be628 100644
--- a/tools/bpf/bpftool/common.c
+++ b/tools/bpf/bpftool/common.c
@@ -204,7 +204,11 @@ int do_pin_fd(int fd, const char *name)
         if (err)
                 return err;
 
-        return bpf_obj_pin(fd, name);
+        err = bpf_obj_pin(fd, name);
+        if (err)
+                p_err("can't pin the object (%s): %s", name, strerror(errno));
+
+        return err;
 }
 
 int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32))
@@ -237,7 +241,7 @@ int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32))
 
         fd = get_fd_by_id(id);
         if (fd < 0) {
-                p_err("can't get prog by id (%u): %s", id, strerror(errno));
+                p_err("can't open object by id (%u): %s", id, strerror(errno));
                 return -1;
         }
 
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 66f04a4846a5..43fdbbfe41bb 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -363,7 +363,9 @@ static int do_show(int argc, char **argv)
                 if (fd < 0)
                         return -1;
 
-                return show_prog(fd);
+                err = show_prog(fd);
+                close(fd);
+                return err;
         }
 
         if (argc)
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index f5597503c771..e9ef4ca6a655 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -809,7 +809,7 @@ kvp_get_ip_info(int family, char *if_name, int op,
         int sn_offset = 0;
         int error = 0;
         char *buffer;
-        struct hv_kvp_ipaddr_value *ip_buffer;
+        struct hv_kvp_ipaddr_value *ip_buffer = NULL;
         char cidr_mask[5]; /* /xyz */
         int weight;
         int i;
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index 4e455018da65..a5aa7d3ac6a1 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -1466,8 +1466,8 @@ union bpf_attr {
  *              If no cookie has been set yet, generate a new cookie. Once
  *              generated, the socket cookie remains stable for the life of the
  *              socket. This helper can be useful for monitoring per socket
- *              networking traffic statistics as it provides a unique socket
- *              identifier per namespace.
+ *              networking traffic statistics as it provides a global socket
+ *              identifier that can be assumed unique.
  *      Return
  *              A 8-byte long non-decreasing number on success, or 0 if the
  *              socket field is missing inside *skb*.
@@ -1571,8 +1571,11 @@ union bpf_attr {
  *              but this is only implemented for native XDP (with driver
  *              support) as of this writing).
  *
- *              All values for *flags* are reserved for future usage, and must
- *              be left at zero.
+ *              The lower two bits of *flags* are used as the return code if
+ *              the map lookup fails. This is so that the return value can be
+ *              one of the XDP program return codes up to XDP_TX, as chosen by
+ *              the caller. Any higher bits in the *flags* argument must be
+ *              unset.
  *
  *              When used to redirect packets to net devices, this helper
  *              provides a high performance increase over **bpf_redirect**\ ().
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 2586b6cb8f34..2b57d7ea7836 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -182,7 +182,6 @@ struct bpf_program {
         bpf_program_clear_priv_t clear_priv;
 
         enum bpf_attach_type expected_attach_type;
-        int btf_fd;
         void *func_info;
         __u32 func_info_rec_size;
         __u32 func_info_cnt;
@@ -313,7 +312,6 @@ void bpf_program__unload(struct bpf_program *prog)
         prog->instances.nr = -1;
         zfree(&prog->instances.fds);
 
-        zclose(prog->btf_fd);
         zfree(&prog->func_info);
         zfree(&prog->line_info);
 }
@@ -392,7 +390,6 @@ bpf_program__init(void *data, size_t size, char *section_name, int idx,
         prog->instances.fds = NULL;
         prog->instances.nr = -1;
         prog->type = BPF_PROG_TYPE_UNSPEC;
-        prog->btf_fd = -1;
 
         return 0;
 errout:
@@ -2288,9 +2285,6 @@ bpf_program_reloc_btf_ext(struct bpf_program *prog, struct bpf_object *obj,
                 prog->line_info_rec_size = btf_ext__line_info_rec_size(obj->btf_ext);
         }
 
-        if (!insn_offset)
-                prog->btf_fd = btf__fd(obj->btf);
-
         return 0;
 }
 
@@ -2463,7 +2457,7 @@ load_program(struct bpf_program *prog, struct bpf_insn *insns, int insns_cnt,
         char *cp, errmsg[STRERR_BUFSIZE];
         int log_buf_size = BPF_LOG_BUF_SIZE;
         char *log_buf;
-        int ret;
+        int btf_fd, ret;
 
         if (!insns || !insns_cnt)
                 return -EINVAL;
@@ -2478,7 +2472,12 @@ load_program(struct bpf_program *prog, struct bpf_insn *insns, int insns_cnt,
         load_attr.license = license;
         load_attr.kern_version = kern_version;
         load_attr.prog_ifindex = prog->prog_ifindex;
-        load_attr.prog_btf_fd = prog->btf_fd >= 0 ? prog->btf_fd : 0;
+        /* if .BTF.ext was loaded, kernel supports associated BTF for prog */
+        if (prog->obj->btf_ext)
+                btf_fd = bpf_object__btf_fd(prog->obj);
+        else
+                btf_fd = -1;
+        load_attr.prog_btf_fd = btf_fd >= 0 ? btf_fd : 0;
         load_attr.func_info = prog->func_info;
         load_attr.func_info_rec_size = prog->func_info_rec_size;
         load_attr.func_info_cnt = prog->func_info_cnt;
@@ -5000,13 +4999,15 @@ int libbpf_num_possible_cpus(void)
         static const char *fcpu = "/sys/devices/system/cpu/possible";
         int len = 0, n = 0, il = 0, ir = 0;
         unsigned int start = 0, end = 0;
+        int tmp_cpus = 0;
         static int cpus;
         char buf[128];
         int error = 0;
         int fd = -1;
 
-        if (cpus > 0)
-                return cpus;
+        tmp_cpus = READ_ONCE(cpus);
+        if (tmp_cpus > 0)
+                return tmp_cpus;
 
         fd = open(fcpu, O_RDONLY);
         if (fd < 0) {
@@ -5029,7 +5030,7 @@ int libbpf_num_possible_cpus(void)
         }
         buf[len] = '\0';
 
-        for (ir = 0, cpus = 0; ir <= len; ir++) {
+        for (ir = 0, tmp_cpus = 0; ir <= len; ir++) {
                 /* Each sub string separated by ',' has format \d+-\d+ or \d+ */
                 if (buf[ir] == ',' || buf[ir] == '\0') {
                         buf[ir] = '\0';
@@ -5041,13 +5042,15 @@ int libbpf_num_possible_cpus(void)
                         } else if (n == 1) {
                                 end = start;
                         }
-                        cpus += end - start + 1;
+                        tmp_cpus += end - start + 1;
                         il = ir + 1;
                 }
         }
-        if (cpus <= 0) {
-                pr_warning("Invalid #CPUs %d from %s\n", cpus, fcpu);
+        if (tmp_cpus <= 0) {
+                pr_warning("Invalid #CPUs %d from %s\n", tmp_cpus, fcpu);
                 return -EINVAL;
         }
-        return cpus;
+
+        WRITE_ONCE(cpus, tmp_cpus);
+        return tmp_cpus;
 }
diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile
index 045f5f7d68ab..13f1e8b9ac52 100644
--- a/tools/power/x86/turbostat/Makefile
+++ b/tools/power/x86/turbostat/Makefile
@@ -9,9 +9,10 @@ ifeq ("$(origin O)", "command line")
 endif
 
 turbostat : turbostat.c
-override CFLAGS +=      -Wall -I../../../include
+override CFLAGS +=      -O2 -Wall -I../../../include
 override CFLAGS +=      -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
 override CFLAGS +=      -DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"'
+override CFLAGS +=      -D_FORTIFY_SOURCE=2
 
 %: %.c
         @mkdir -p $(BUILD_OUTPUT)
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 75fc4fb9901c..b2a86438f074 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -39,7 +39,6 @@ FILE *outf;
 int *fd_percpu;
 struct timeval interval_tv = {5, 0};
 struct timespec interval_ts = {5, 0};
-struct timespec one_msec = {0, 1000000};
 unsigned int num_iterations;
 unsigned int debug;
 unsigned int quiet;
@@ -60,6 +59,7 @@ unsigned int do_irtl_hsw;
 unsigned int units = 1000000;   /* MHz etc */
 unsigned int genuine_intel;
 unsigned int authentic_amd;
+unsigned int hygon_genuine;
 unsigned int max_level, max_extended_level;
 unsigned int has_invariant_tsc;
 unsigned int do_nhm_platform_info;
@@ -100,6 +100,7 @@ unsigned int has_hwp_epp;		/* IA32_HWP_REQUEST[bits 31:24] */
 unsigned int has_hwp_pkg;               /* IA32_HWP_REQUEST_PKG */
 unsigned int has_misc_feature_control;
 unsigned int first_counter_read = 1;
+int ignore_stdin;
 
 #define RAPL_PKG                (1 << 0)
                                         /* 0x610 MSR_PKG_POWER_LIMIT */
@@ -166,6 +167,7 @@ size_t cpu_present_setsize, cpu_affinity_setsize, cpu_subset_size;
 struct thread_data {
         struct timeval tv_begin;
         struct timeval tv_end;
+        struct timeval tv_delta;
         unsigned long long tsc;
         unsigned long long aperf;
         unsigned long long mperf;
@@ -506,6 +508,7 @@ unsigned long long bic_enabled = (0xFFFFFFFFFFFFFFFFULL & ~BIC_DISABLED_BY_DEFAU
 unsigned long long bic_present = BIC_USEC | BIC_TOD | BIC_sysfs | BIC_APIC | BIC_X2APIC;
 
 #define DO_BIC(COUNTER_NAME) (bic_enabled & bic_present & COUNTER_NAME)
+#define DO_BIC_READ(COUNTER_NAME) (bic_present & COUNTER_NAME)
 #define ENABLE_BIC(COUNTER_NAME) (bic_enabled |= COUNTER_NAME)
 #define BIC_PRESENT(COUNTER_BIT) (bic_present |= COUNTER_BIT)
 #define BIC_NOT_PRESENT(COUNTER_BIT) (bic_present &= ~COUNTER_BIT)
@@ -849,7 +852,6 @@ int dump_counters(struct thread_data *t, struct core_data *c,
                 outp += sprintf(outp, "pc8: %016llX\n", p->pc8);
                 outp += sprintf(outp, "pc9: %016llX\n", p->pc9);
                 outp += sprintf(outp, "pc10: %016llX\n", p->pc10);
-                outp += sprintf(outp, "pc10: %016llX\n", p->pc10);
                 outp += sprintf(outp, "cpu_lpi: %016llX\n", p->cpu_lpi);
                 outp += sprintf(outp, "sys_lpi: %016llX\n", p->sys_lpi);
                 outp += sprintf(outp, "Joules PKG: %0X\n", p->energy_pkg);
@@ -911,7 +913,7 @@ int format_counters(struct thread_data *t, struct core_data *c,
         if (DO_BIC(BIC_TOD))
                 outp += sprintf(outp, "%10ld.%06ld\t", t->tv_end.tv_sec, t->tv_end.tv_usec);
 
-        interval_float = tv_delta.tv_sec + tv_delta.tv_usec/1000000.0;
+        interval_float = t->tv_delta.tv_sec + t->tv_delta.tv_usec/1000000.0;
 
         tsc = t->tsc * tsc_tweak;
 
@@ -1287,6 +1289,14 @@ delta_core(struct core_data *new, struct core_data *old)
         }
 }
 
+int soft_c1_residency_display(int bic)
+{
+        if (!DO_BIC(BIC_CPU_c1) || use_c1_residency_msr)
+                return 0;
+
+        return DO_BIC_READ(bic);
+}
+
 /*
  * old = new - old
  */
@@ -1309,6 +1319,7 @@ delta_thread(struct thread_data *new, struct thread_data *old,
          * over-write old w/ new so we can print end of interval values
          */
 
+        timersub(&new->tv_begin, &old->tv_begin, &old->tv_delta);
         old->tv_begin = new->tv_begin;
         old->tv_end = new->tv_end;
 
@@ -1322,7 +1333,8 @@ delta_thread(struct thread_data *new, struct thread_data *old,
 
         old->c1 = new->c1 - old->c1;
 
-        if (DO_BIC(BIC_Avg_MHz) || DO_BIC(BIC_Busy) || DO_BIC(BIC_Bzy_MHz)) {
+        if (DO_BIC(BIC_Avg_MHz) || DO_BIC(BIC_Busy) || DO_BIC(BIC_Bzy_MHz) ||
+            soft_c1_residency_display(BIC_Avg_MHz)) {
                 if ((new->aperf > old->aperf) && (new->mperf > old->mperf)) {
                         old->aperf = new->aperf - old->aperf;
                         old->mperf = new->mperf - old->mperf;
@@ -1404,6 +1416,8 @@ void clear_counters(struct thread_data *t, struct core_data *c, struct pkg_data
         t->tv_begin.tv_usec = 0;
         t->tv_end.tv_sec = 0;
         t->tv_end.tv_usec = 0;
+        t->tv_delta.tv_sec = 0;
+        t->tv_delta.tv_usec = 0;
 
         t->tsc = 0;
         t->aperf = 0;
@@ -1573,6 +1587,9 @@ void compute_average(struct thread_data *t, struct core_data *c,
 
         for_all_cpus(sum_counters, t, c, p);
 
+        /* Use the global time delta for the average. */
+        average.threads.tv_delta = tv_delta;
+
         average.threads.tsc /= topo.num_cpus;
         average.threads.aperf /= topo.num_cpus;
         average.threads.mperf /= topo.num_cpus;
@@ -1714,7 +1731,7 @@ void get_apic_id(struct thread_data *t)
         if (!DO_BIC(BIC_X2APIC))
                 return;
 
-        if (authentic_amd) {
+        if (authentic_amd || hygon_genuine) {
                 unsigned int topology_extensions;
 
                 if (max_extended_level < 0x8000001e)
@@ -1762,19 +1779,20 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
         struct msr_counter *mp;
         int i;
 
-        gettimeofday(&t->tv_begin, (struct timezone *)NULL);
-
         if (cpu_migrate(cpu)) {
                 fprintf(outf, "Could not migrate to CPU %d\n", cpu);
                 return -1;
         }
 
+        gettimeofday(&t->tv_begin, (struct timezone *)NULL);
+
         if (first_counter_read)
                 get_apic_id(t);
 retry:
         t->tsc = rdtsc();       /* we are running on local CPU of interest */
 
-        if (DO_BIC(BIC_Avg_MHz) || DO_BIC(BIC_Busy) || DO_BIC(BIC_Bzy_MHz)) {
+        if (DO_BIC(BIC_Avg_MHz) || DO_BIC(BIC_Busy) || DO_BIC(BIC_Bzy_MHz) ||
+            soft_c1_residency_display(BIC_Avg_MHz)) {
                 unsigned long long tsc_before, tsc_between, tsc_after, aperf_time, mperf_time;
 
                 /*
@@ -1851,20 +1869,20 @@ retry:
         if (!(t->flags & CPU_IS_FIRST_THREAD_IN_CORE))
                 goto done;
 
-        if (DO_BIC(BIC_CPU_c3)) {
+        if (DO_BIC(BIC_CPU_c3) || soft_c1_residency_display(BIC_CPU_c3)) {
                 if (get_msr(cpu, MSR_CORE_C3_RESIDENCY, &c->c3))
                         return -6;
         }
 
-        if (DO_BIC(BIC_CPU_c6) && !do_knl_cstates) {
+        if ((DO_BIC(BIC_CPU_c6) || soft_c1_residency_display(BIC_CPU_c6)) && !do_knl_cstates) {
                 if (get_msr(cpu, MSR_CORE_C6_RESIDENCY, &c->c6))
                         return -7;
-        } else if (do_knl_cstates) {
+        } else if (do_knl_cstates || soft_c1_residency_display(BIC_CPU_c6)) {
                 if (get_msr(cpu, MSR_KNL_CORE_C6_RESIDENCY, &c->c6))
                         return -7;
         }
 
-        if (DO_BIC(BIC_CPU_c7))
+        if (DO_BIC(BIC_CPU_c7) || soft_c1_residency_display(BIC_CPU_c7))
                 if (get_msr(cpu, MSR_CORE_C7_RESIDENCY, &c->c7))
                         return -8;
 
@@ -2912,6 +2930,7 @@ int snapshot_cpu_lpi_us(void)
         if (retval != 1) {
                 fprintf(stderr, "Disabling Low Power Idle CPU output\n");
                 BIC_NOT_PRESENT(BIC_CPU_LPI);
+                fclose(fp);
                 return -1;
         }
 
@@ -2938,6 +2957,7 @@ int snapshot_sys_lpi_us(void)
         if (retval != 1) {
                 fprintf(stderr, "Disabling Low Power Idle System output\n");
                 BIC_NOT_PRESENT(BIC_SYS_LPI);
+                fclose(fp);
                 return -1;
         }
         fclose(fp);
@@ -2985,8 +3005,6 @@ static void signal_handler (int signal)
                         fprintf(stderr, "SIGUSR1\n");
                 break;
         }
-        /* make sure this manually-invoked interval is at least 1ms long */
-        nanosleep(&one_msec, NULL);
 }
 
 void setup_signal_handler(void)
@@ -3005,29 +3023,38 @@ void setup_signal_handler(void)
 
 void do_sleep(void)
 {
-        struct timeval select_timeout;
+        struct timeval tout;
+        struct timespec rest;
         fd_set readfds;
         int retval;
 
         FD_ZERO(&readfds);
         FD_SET(0, &readfds);
 
-        if (!isatty(fileno(stdin))) {
+        if (ignore_stdin) {
                 nanosleep(&interval_ts, NULL);
                 return;
         }
 
-        select_timeout = interval_tv;
-        retval = select(1, &readfds, NULL, NULL, &select_timeout);
+        tout = interval_tv;
+        retval = select(1, &readfds, NULL, NULL, &tout);
 
         if (retval == 1) {
                 switch (getc(stdin)) {
                 case 'q':
                         exit_requested = 1;
                         break;
+                case EOF:
+                        /*
+                         * 'stdin' is a pipe closed on the other end. There
+                         * won't be any further input.
+                         */
+                        ignore_stdin = 1;
+                        /* Sleep the rest of the time */
+                        rest.tv_sec = (tout.tv_sec + tout.tv_usec / 1000000);
+                        rest.tv_nsec = (tout.tv_usec % 1000000) * 1000;
+                        nanosleep(&rest, NULL);
                 }
-                /* make sure this manually-invoked interval is at least 1ms long */
-                nanosleep(&one_msec, NULL);
         }
 }
 
@@ -3209,6 +3236,7 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)
                 break;
         case INTEL_FAM6_HASWELL_CORE:   /* HSW */
         case INTEL_FAM6_HASWELL_X:      /* HSX */
+        case INTEL_FAM6_HASWELL_ULT:    /* HSW */
         case INTEL_FAM6_HASWELL_GT3E:   /* HSW */
         case INTEL_FAM6_BROADWELL_CORE: /* BDW */
         case INTEL_FAM6_BROADWELL_GT3E: /* BDW */
@@ -3405,6 +3433,7 @@ int has_config_tdp(unsigned int family, unsigned int model)
         case INTEL_FAM6_IVYBRIDGE:      /* IVB */
         case INTEL_FAM6_HASWELL_CORE:   /* HSW */
         case INTEL_FAM6_HASWELL_X:      /* HSX */
+        case INTEL_FAM6_HASWELL_ULT:    /* HSW */
         case INTEL_FAM6_HASWELL_GT3E:   /* HSW */
         case INTEL_FAM6_BROADWELL_CORE: /* BDW */
         case INTEL_FAM6_BROADWELL_GT3E: /* BDW */
@@ -3803,6 +3832,7 @@ double get_tdp_amd(unsigned int family)
 {
         switch (family) {
         case 0x17:
+        case 0x18:
         default:
                 /* This is the max stock TDP of HEDT/Server Fam17h chips */
                 return 250.0;
@@ -3841,6 +3871,7 @@ void rapl_probe_intel(unsigned int family, unsigned int model)
         case INTEL_FAM6_SANDYBRIDGE:
         case INTEL_FAM6_IVYBRIDGE:
         case INTEL_FAM6_HASWELL_CORE:   /* HSW */
+        case INTEL_FAM6_HASWELL_ULT:    /* HSW */
         case INTEL_FAM6_HASWELL_GT3E:   /* HSW */
         case INTEL_FAM6_BROADWELL_CORE: /* BDW */
         case INTEL_FAM6_BROADWELL_GT3E: /* BDW */
@@ -3982,6 +4013,7 @@ void rapl_probe_amd(unsigned int family, unsigned int model)
 
         switch (family) {
         case 0x17: /* Zen, Zen+ */
+        case 0x18: /* Hygon Dhyana */
                 do_rapl = RAPL_AMD_F17H | RAPL_PER_CORE_ENERGY;
                 if (rapl_joules) {
                         BIC_PRESENT(BIC_Pkg_J);
@@ -4002,7 +4034,7 @@ void rapl_probe_amd(unsigned int family, unsigned int model)
         rapl_energy_units = ldexp(1.0, -(msr >> 8 & 0x1f));
         rapl_power_units = ldexp(1.0, -(msr & 0xf));
 
-        tdp = get_tdp_amd(model);
+        tdp = get_tdp_amd(family);
 
         rapl_joule_counter_range = 0xFFFFFFFF * rapl_energy_units / tdp;
         if (!quiet)
@@ -4018,7 +4050,7 @@ void rapl_probe(unsigned int family, unsigned int model)
 {
         if (genuine_intel)
                 rapl_probe_intel(family, model);
-        if (authentic_amd)
+        if (authentic_amd || hygon_genuine)
                 rapl_probe_amd(family, model);
 }
 
@@ -4032,6 +4064,7 @@ void perf_limit_reasons_probe(unsigned int family, unsigned int model)
 
         switch (model) {
         case INTEL_FAM6_HASWELL_CORE:   /* HSW */
+        case INTEL_FAM6_HASWELL_ULT:    /* HSW */
         case INTEL_FAM6_HASWELL_GT3E:   /* HSW */
                 do_gfx_perf_limit_reasons = 1;
         case INTEL_FAM6_HASWELL_X:      /* HSX */
@@ -4251,6 +4284,7 @@ int has_snb_msrs(unsigned int family, unsigned int model)
         case INTEL_FAM6_IVYBRIDGE_X:    /* IVB Xeon */
         case INTEL_FAM6_HASWELL_CORE:   /* HSW */
         case INTEL_FAM6_HASWELL_X:      /* HSW */
+        case INTEL_FAM6_HASWELL_ULT:    /* HSW */
         case INTEL_FAM6_HASWELL_GT3E:   /* HSW */
         case INTEL_FAM6_BROADWELL_CORE: /* BDW */
         case INTEL_FAM6_BROADWELL_GT3E: /* BDW */
@@ -4267,7 +4301,7 @@ int has_snb_msrs(unsigned int family, unsigned int model)
 }
 
 /*
- * HSW adds support for additional MSRs:
+ * HSW ULT added support for C8/C9/C10 MSRs:
  *
  * MSR_PKG_C8_RESIDENCY         0x00000630
  * MSR_PKG_C9_RESIDENCY         0x00000631
@@ -4278,13 +4312,13 @@ int has_snb_msrs(unsigned int family, unsigned int model)
  * MSR_PKGC10_IRTL              0x00000635
  *
  */
-int has_hsw_msrs(unsigned int family, unsigned int model)
+int has_c8910_msrs(unsigned int family, unsigned int model)
 {
         if (!genuine_intel)
                 return 0;
 
         switch (model) {
-        case INTEL_FAM6_HASWELL_CORE:
+        case INTEL_FAM6_HASWELL_ULT:    /* HSW */
         case INTEL_FAM6_BROADWELL_CORE: /* BDW */
         case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
         case INTEL_FAM6_CANNONLAKE_MOBILE:      /* CNL */
@@ -4568,9 +4602,6 @@ unsigned int intel_model_duplicates(unsigned int model)
         case INTEL_FAM6_XEON_PHI_KNM:
                 return INTEL_FAM6_XEON_PHI_KNL;
 
-        case INTEL_FAM6_HASWELL_ULT:
-                return INTEL_FAM6_HASWELL_CORE;
-
         case INTEL_FAM6_BROADWELL_X:
         case INTEL_FAM6_BROADWELL_XEON_D:       /* BDX-DE */
                 return INTEL_FAM6_BROADWELL_X;
@@ -4582,7 +4613,11 @@ unsigned int intel_model_duplicates(unsigned int model)
                 return INTEL_FAM6_SKYLAKE_MOBILE;
 
         case INTEL_FAM6_ICELAKE_MOBILE:
+        case INTEL_FAM6_ICELAKE_NNPI:
                 return INTEL_FAM6_CANNONLAKE_MOBILE;
+
+        case INTEL_FAM6_ATOM_TREMONT_X:
+                return INTEL_FAM6_ATOM_GOLDMONT_X;
         }
         return model;
 }
@@ -4600,6 +4635,8 @@ void process_cpuid()
                 genuine_intel = 1;
         else if (ebx == 0x68747541 && ecx == 0x444d4163 && edx == 0x69746e65)
                 authentic_amd = 1;
+        else if (ebx == 0x6f677948 && ecx == 0x656e6975 && edx == 0x6e65476e)
+                hygon_genuine = 1;
 
         if (!quiet)
                 fprintf(outf, "CPUID(0): %.4s%.4s%.4s ",
@@ -4820,12 +4857,12 @@ void process_cpuid()
                 BIC_NOT_PRESENT(BIC_CPU_c7);
                 BIC_NOT_PRESENT(BIC_Pkgpc7);
         }
-        if (has_hsw_msrs(family, model)) {
+        if (has_c8910_msrs(family, model)) {
                 BIC_PRESENT(BIC_Pkgpc8);
                 BIC_PRESENT(BIC_Pkgpc9);
                 BIC_PRESENT(BIC_Pkgpc10);
         }
-        do_irtl_hsw = has_hsw_msrs(family, model);
+        do_irtl_hsw = has_c8910_msrs(family, model);
         if (has_skl_msrs(family, model)) {
                 BIC_PRESENT(BIC_Totl_c0);
                 BIC_PRESENT(BIC_Any_c0);
@@ -5123,7 +5160,7 @@ int initialize_counters(int cpu_id)
 
 void allocate_output_buffer()
 {
-        output_buffer = calloc(1, (1 + topo.num_cpus) * 1024);
+        output_buffer = calloc(1, (1 + topo.num_cpus) * 2048);
         outp = output_buffer;
         if (outp == NULL)
                 err(-1, "calloc output buffer");
@@ -5269,7 +5306,7 @@ int get_and_dump_counters(void)
 }
 
 void print_version() {
-        fprintf(outf, "turbostat version 19.03.20"
+        fprintf(outf, "turbostat version 19.08.31"
                 " - Len Brown <lenb@kernel.org>\n");
 }
 
diff --git a/tools/power/x86/x86_energy_perf_policy/Makefile b/tools/power/x86/x86_energy_perf_policy/Makefile
index 1fdeef864e7c..666b325a62a2 100644
--- a/tools/power/x86/x86_energy_perf_policy/Makefile
+++ b/tools/power/x86/x86_energy_perf_policy/Makefile
@@ -9,8 +9,9 @@ ifeq ("$(origin O)", "command line")
 endif
 
 x86_energy_perf_policy : x86_energy_perf_policy.c
-override CFLAGS +=      -Wall -I../../../include
+override CFLAGS +=      -O2 -Wall -I../../../include
 override CFLAGS +=      -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
+override CFLAGS +=      -D_FORTIFY_SOURCE=2
 
 %: %.c
         @mkdir -p $(BUILD_OUTPUT)
diff --git a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.8 b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.8
index 17db1c3af4d0..78c6361898b1 100644
--- a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.8
+++ b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.8
@@ -40,7 +40,7 @@ in the same processor package.
 Hardware P-States (HWP) are effectively an expansion of hardware
 P-state control from the opportunistic turbo-mode P-state range
 to include the entire range of available P-states.
-On Broadwell Xeon, the initial HWP implementation, EBP influenced HWP.
+On Broadwell Xeon, the initial HWP implementation, EPB influenced HWP.
 That influence was removed in subsequent generations,
 where it was moved to the
 Energy_Performance_Preference (EPP) field in
diff --git a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
index 34a796b303fe..3fe1eed900d4 100644
--- a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
+++ b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
@@ -545,7 +545,7 @@ void cmdline(int argc, char **argv)
 
         progname = argv[0];
 
-        while ((opt = getopt_long_only(argc, argv, "+a:c:dD:E:e:f:m:M:rt:u:vw",
+        while ((opt = getopt_long_only(argc, argv, "+a:c:dD:E:e:f:m:M:rt:u:vw:",
                                 long_options, &option_index)) != -1) {
                 switch (opt) {
                 case 'a':
@@ -1259,6 +1259,15 @@ void probe_dev_msr(void)
                 if (system("/sbin/modprobe msr > /dev/null 2>&1"))
                         err(-5, "no /dev/cpu/0/msr, Try \"# modprobe msr\" ");
 }
+
+static void get_cpuid_or_exit(unsigned int leaf,
+                             unsigned int *eax, unsigned int *ebx,
+                             unsigned int *ecx, unsigned int *edx)
+{
+        if (!__get_cpuid(leaf, eax, ebx, ecx, edx))
+                errx(1, "Processor not supported\n");
+}
+
 /*
  * early_cpuid()
  * initialize turbo_is_enabled, has_hwp, has_epb
@@ -1266,15 +1275,10 @@ void probe_dev_msr(void)
  */
 void early_cpuid(void)
 {
-        unsigned int eax, ebx, ecx, edx, max_level;
+        unsigned int eax, ebx, ecx, edx;
         unsigned int fms, family, model;
 
-        __get_cpuid(0, &max_level, &ebx, &ecx, &edx);
-
-        if (max_level < 6)
-                errx(1, "Processor not supported\n");
-
-        __get_cpuid(1, &fms, &ebx, &ecx, &edx);
+        get_cpuid_or_exit(1, &fms, &ebx, &ecx, &edx);
         family = (fms >> 8) & 0xf;
         model = (fms >> 4) & 0xf;
         if (family == 6 || family == 0xf)
@@ -1288,7 +1292,7 @@ void early_cpuid(void)
                 bdx_highest_ratio = msr & 0xFF;
         }
 
-        __get_cpuid(0x6, &eax, &ebx, &ecx, &edx);
+        get_cpuid_or_exit(0x6, &eax, &ebx, &ecx, &edx);
         turbo_is_enabled = (eax >> 1) & 1;
         has_hwp = (eax >> 7) & 1;
         has_epb = (ecx >> 3) & 1;
@@ -1306,7 +1310,7 @@ void parse_cpuid(void)
 
         eax = ebx = ecx = edx = 0;
 
-        __get_cpuid(0, &max_level, &ebx, &ecx, &edx);
+        get_cpuid_or_exit(0, &max_level, &ebx, &ecx, &edx);
 
         if (ebx == 0x756e6547 && edx == 0x49656e69 && ecx == 0x6c65746e)
                 genuine_intel = 1;
@@ -1315,7 +1319,7 @@ void parse_cpuid(void)
                 fprintf(stderr, "CPUID(0): %.4s%.4s%.4s ",
                         (char *)&ebx, (char *)&edx, (char *)&ecx);
 
-        __get_cpuid(1, &fms, &ebx, &ecx, &edx);
+        get_cpuid_or_exit(1, &fms, &ebx, &ecx, &edx);
         family = (fms >> 8) & 0xf;
         model = (fms >> 4) & 0xf;
         stepping = fms & 0xf;
@@ -1340,7 +1344,7 @@ void parse_cpuid(void)
                 errx(1, "CPUID: no MSR");
 
 
-        __get_cpuid(0x6, &eax, &ebx, &ecx, &edx);
+        get_cpuid_or_exit(0x6, &eax, &ebx, &ecx, &edx);
         /* turbo_is_enabled already set */
         /* has_hwp already set */
         has_hwp_notify = eax & (1 << 8);
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index c085964e1d05..96752ebd938f 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -34,6 +34,9 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test
 BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c)))
 TEST_GEN_FILES = $(BPF_OBJ_FILES)
 
+BTF_C_FILES = $(wildcard progs/btf_dump_test_case_*.c)
+TEST_FILES = $(BTF_C_FILES)
+
 # Also test sub-register code-gen if LLVM has eBPF v3 processor support which
 # contains both ALU32 and JMP32 instructions.
 SUBREG_CODEGEN := $(shell echo "int cal(int a) { return a > 0; }" | \
@@ -68,7 +71,8 @@ TEST_PROGS := test_kmod.sh \
 TEST_PROGS_EXTENDED := with_addr.sh \
         with_tunnels.sh \
         tcp_client.py \
-        tcp_server.py
+        tcp_server.py \
+        test_xdp_vlan.sh
 
 # Compile but not part of 'make run_tests'
 TEST_GEN_PROGS_EXTENDED = test_libbpf_open test_sock_addr test_skb_cgroup_id_user \
diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config
index f7a0744db31e..5dc109f4c097 100644
--- a/tools/testing/selftests/bpf/config
+++ b/tools/testing/selftests/bpf/config
@@ -34,3 +34,4 @@ CONFIG_NET_MPLS_GSO=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_IPV6_SIT=m
+CONFIG_BPF_JIT=y
diff --git a/tools/testing/selftests/bpf/test_btf_dump.c b/tools/testing/selftests/bpf/test_btf_dump.c
index 8f850823d35f..6e75dd3cb14f 100644
--- a/tools/testing/selftests/bpf/test_btf_dump.c
+++ b/tools/testing/selftests/bpf/test_btf_dump.c
@@ -97,6 +97,13 @@ int test_btf_dump_case(int n, struct btf_dump_test_case *test_case)
         }
 
         snprintf(test_file, sizeof(test_file), "progs/%s.c", test_case->name);
+        if (access(test_file, R_OK) == -1)
+                /*
+                 * When the test is run with O=, kselftest copies TEST_FILES
+                 * without preserving the directory structure.
+                 */
+                snprintf(test_file, sizeof(test_file), "%s.c",
+                        test_case->name);
         /*
          * Diff test output and expected test output, contained between
          * START-EXPECTED-OUTPUT and END-EXPECTED-OUTPUT lines in test case.
diff --git a/tools/testing/selftests/bpf/test_cgroup_storage.c b/tools/testing/selftests/bpf/test_cgroup_storage.c
index 2fc4625c1a15..655729004391 100644
--- a/tools/testing/selftests/bpf/test_cgroup_storage.c
+++ b/tools/testing/selftests/bpf/test_cgroup_storage.c
@@ -20,9 +20,9 @@ int main(int argc, char **argv)
                 BPF_MOV64_IMM(BPF_REG_2, 0), /* flags, not used */
                 BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
                              BPF_FUNC_get_local_storage),
-                BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_0, 0),
+                BPF_LDX_MEM(BPF_DW, BPF_REG_3, BPF_REG_0, 0),
                 BPF_ALU64_IMM(BPF_ADD, BPF_REG_3, 0x1),
-                BPF_STX_MEM(BPF_W, BPF_REG_0, BPF_REG_3, 0),
+                BPF_STX_MEM(BPF_DW, BPF_REG_0, BPF_REG_3, 0),
 
                 BPF_LD_MAP_FD(BPF_REG_1, 0), /* map fd */
                 BPF_MOV64_IMM(BPF_REG_2, 0), /* flags, not used */
@@ -30,7 +30,7 @@ int main(int argc, char **argv)
                              BPF_FUNC_get_local_storage),
                 BPF_MOV64_IMM(BPF_REG_1, 1),
                 BPF_STX_XADD(BPF_DW, BPF_REG_0, BPF_REG_1, 0),
-                BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 0),
+                BPF_LDX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, 0),
                 BPF_ALU64_IMM(BPF_AND, BPF_REG_1, 0x1),
                 BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
                 BPF_EXIT_INSN(),
diff --git a/tools/testing/selftests/bpf/test_sock.c b/tools/testing/selftests/bpf/test_sock.c
index fb679ac3d4b0..0e6652733462 100644
--- a/tools/testing/selftests/bpf/test_sock.c
+++ b/tools/testing/selftests/bpf/test_sock.c
@@ -13,6 +13,7 @@
 #include <bpf/bpf.h>
 
 #include "cgroup_helpers.h"
+#include "bpf_endian.h"
 #include "bpf_rlimit.h"
 #include "bpf_util.h"
 
@@ -232,7 +233,8 @@ static struct sock_test tests[] = {
                         /* if (ip == expected && port == expected) */
                         BPF_LDX_MEM(BPF_W, BPF_REG_7, BPF_REG_6,
                                     offsetof(struct bpf_sock, src_ip6[3])),
-                        BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x01000000, 4),
+                        BPF_JMP_IMM(BPF_JNE, BPF_REG_7,
+                                    __bpf_constant_ntohl(0x00000001), 4),
                         BPF_LDX_MEM(BPF_W, BPF_REG_7, BPF_REG_6,
                                     offsetof(struct bpf_sock, src_port)),
                         BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x2001, 2),
@@ -261,7 +263,8 @@ static struct sock_test tests[] = {
                         /* if (ip == expected && port == expected) */
                         BPF_LDX_MEM(BPF_W, BPF_REG_7, BPF_REG_6,
                                     offsetof(struct bpf_sock, src_ip4)),
-                        BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x0100007F, 4),
+                        BPF_JMP_IMM(BPF_JNE, BPF_REG_7,
+                                    __bpf_constant_ntohl(0x7F000001), 4),
                         BPF_LDX_MEM(BPF_W, BPF_REG_7, BPF_REG_6,
                                     offsetof(struct bpf_sock, src_port)),
                         BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x1002, 2),
diff --git a/tools/testing/selftests/bpf/verifier/loops1.c b/tools/testing/selftests/bpf/verifier/loops1.c
index 5e980a5ab69d..1fc4e61e9f9f 100644
--- a/tools/testing/selftests/bpf/verifier/loops1.c
+++ b/tools/testing/selftests/bpf/verifier/loops1.c
@@ -159,3 +159,31 @@
         .errstr = "loop detected",
         .prog_type = BPF_PROG_TYPE_TRACEPOINT,
 },
+{
+        "not-taken loop with back jump to 1st insn",
+        .insns = {
+        BPF_MOV64_IMM(BPF_REG_0, 123),
+        BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 4, -2),
+        BPF_EXIT_INSN(),
+        },
+        .result = ACCEPT,
+        .prog_type = BPF_PROG_TYPE_XDP,
+        .retval = 123,
+},
+{
+        "taken loop with back jump to 1st insn",
+        .insns = {
+        BPF_MOV64_IMM(BPF_REG_1, 10),
+        BPF_MOV64_IMM(BPF_REG_2, 0),
+        BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 1, 0, 1),
+        BPF_EXIT_INSN(),
+        BPF_ALU64_REG(BPF_ADD, BPF_REG_2, BPF_REG_1),
+        BPF_ALU64_IMM(BPF_SUB, BPF_REG_1, 1),
+        BPF_JMP_IMM(BPF_JNE, BPF_REG_1, 0, -3),
+        BPF_MOV64_REG(BPF_REG_0, BPF_REG_2),
+        BPF_EXIT_INSN(),
+        },
+        .result = ACCEPT,
+        .prog_type = BPF_PROG_TYPE_XDP,
+        .retval = 55,
+},
diff --git a/tools/testing/selftests/kvm/include/evmcs.h b/tools/testing/selftests/kvm/include/evmcs.h
index 4059014d93ea..4912d23844bc 100644
--- a/tools/testing/selftests/kvm/include/evmcs.h
+++ b/tools/testing/selftests/kvm/include/evmcs.h
@@ -220,6 +220,8 @@ struct hv_enlightened_vmcs {
 struct hv_enlightened_vmcs *current_evmcs;
 struct hv_vp_assist_page *current_vp_assist;
 
+int vcpu_enable_evmcs(struct kvm_vm *vm, int vcpu_id);
+
 static inline int enable_vp_assist(uint64_t vp_assist_pa, void *vp_assist)
 {
         u64 val = (vp_assist_pa & HV_X64_MSR_VP_ASSIST_PAGE_ADDRESS_MASK) |
diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/testing/selftests/kvm/lib/x86_64/processor.c
index 6cb34a0fa200..0a5e487dbc50 100644
--- a/tools/testing/selftests/kvm/lib/x86_64/processor.c
+++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c
@@ -1060,9 +1060,11 @@ struct kvm_x86_state *vcpu_save_state(struct kvm_vm *vm, uint32_t vcpuid)
         TEST_ASSERT(r == 0, "Unexpected result from KVM_GET_XSAVE, r: %i",
                 r);
 
-        r = ioctl(vcpu->fd, KVM_GET_XCRS, &state->xcrs);
-        TEST_ASSERT(r == 0, "Unexpected result from KVM_GET_XCRS, r: %i",
-                r);
+        if (kvm_check_cap(KVM_CAP_XCRS)) {
+                r = ioctl(vcpu->fd, KVM_GET_XCRS, &state->xcrs);
+                TEST_ASSERT(r == 0, "Unexpected result from KVM_GET_XCRS, r: %i",
+                            r);
+        }
 
         r = ioctl(vcpu->fd, KVM_GET_SREGS, &state->sregs);
         TEST_ASSERT(r == 0, "Unexpected result from KVM_GET_SREGS, r: %i",
@@ -1103,9 +1105,11 @@ void vcpu_load_state(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_x86_state *s
         TEST_ASSERT(r == 0, "Unexpected result from KVM_SET_XSAVE, r: %i",
                 r);
 
-        r = ioctl(vcpu->fd, KVM_SET_XCRS, &state->xcrs);
-        TEST_ASSERT(r == 0, "Unexpected result from KVM_SET_XCRS, r: %i",
-                r);
+        if (kvm_check_cap(KVM_CAP_XCRS)) {
+                r = ioctl(vcpu->fd, KVM_SET_XCRS, &state->xcrs);
+                TEST_ASSERT(r == 0, "Unexpected result from KVM_SET_XCRS, r: %i",
+                            r);
+        }
 
         r = ioctl(vcpu->fd, KVM_SET_SREGS, &state->sregs);
         TEST_ASSERT(r == 0, "Unexpected result from KVM_SET_SREGS, r: %i",
diff --git a/tools/testing/selftests/kvm/lib/x86_64/vmx.c b/tools/testing/selftests/kvm/lib/x86_64/vmx.c
index 204f847bd065..9cef0455b819 100644
--- a/tools/testing/selftests/kvm/lib/x86_64/vmx.c
+++ b/tools/testing/selftests/kvm/lib/x86_64/vmx.c
@@ -12,6 +12,26 @@
 
 bool enable_evmcs;
 
+int vcpu_enable_evmcs(struct kvm_vm *vm, int vcpu_id)
+{
+        uint16_t evmcs_ver;
+
+        struct kvm_enable_cap enable_evmcs_cap = {
+                .cap = KVM_CAP_HYPERV_ENLIGHTENED_VMCS,
+                 .args[0] = (unsigned long)&evmcs_ver
+        };
+
+        vcpu_ioctl(vm, vcpu_id, KVM_ENABLE_CAP, &enable_evmcs_cap);
+
+        /* KVM should return supported EVMCS version range */
+        TEST_ASSERT(((evmcs_ver >> 8) >= (evmcs_ver & 0xff)) &&
+                    (evmcs_ver & 0xff) > 0,
+                    "Incorrect EVMCS version range: %x:%x\n",
+                    evmcs_ver & 0xff, evmcs_ver >> 8);
+
+        return evmcs_ver;
+}
+
 /* Allocate memory regions for nested VMX tests.
  *
  * Input Args:
diff --git a/tools/testing/selftests/kvm/x86_64/evmcs_test.c b/tools/testing/selftests/kvm/x86_64/evmcs_test.c
index f95c08343b48..92915e6408e7 100644
--- a/tools/testing/selftests/kvm/x86_64/evmcs_test.c
+++ b/tools/testing/selftests/kvm/x86_64/evmcs_test.c
@@ -79,11 +79,6 @@ int main(int argc, char *argv[])
         struct kvm_x86_state *state;
         struct ucall uc;
         int stage;
-        uint16_t evmcs_ver;
-        struct kvm_enable_cap enable_evmcs_cap = {
-                .cap = KVM_CAP_HYPERV_ENLIGHTENED_VMCS,
-                 .args[0] = (unsigned long)&evmcs_ver
-        };
 
         /* Create VM */
         vm = vm_create_default(VCPU_ID, 0, guest_code);
@@ -96,13 +91,7 @@ int main(int argc, char *argv[])
                 exit(KSFT_SKIP);
         }
 
-        vcpu_ioctl(vm, VCPU_ID, KVM_ENABLE_CAP, &enable_evmcs_cap);
-
-        /* KVM should return supported EVMCS version range */
-        TEST_ASSERT(((evmcs_ver >> 8) >= (evmcs_ver & 0xff)) &&
-                    (evmcs_ver & 0xff) > 0,
-                    "Incorrect EVMCS version range: %x:%x\n",
-                    evmcs_ver & 0xff, evmcs_ver >> 8);
+        vcpu_enable_evmcs(vm, VCPU_ID);
 
         run = vcpu_state(vm, VCPU_ID);
 
@@ -146,7 +135,7 @@ int main(int argc, char *argv[])
                 kvm_vm_restart(vm, O_RDWR);
                 vm_vcpu_add(vm, VCPU_ID);
                 vcpu_set_cpuid(vm, VCPU_ID, kvm_get_supported_cpuid());
-                vcpu_ioctl(vm, VCPU_ID, KVM_ENABLE_CAP, &enable_evmcs_cap);
+                vcpu_enable_evmcs(vm, VCPU_ID);
                 vcpu_load_state(vm, VCPU_ID, state);
                 run = vcpu_state(vm, VCPU_ID);
                 free(state);
diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c b/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
index f72b3043db0e..ee59831fbc98 100644
--- a/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
+++ b/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c
@@ -18,6 +18,7 @@
 #include "test_util.h"
 #include "kvm_util.h"
 #include "processor.h"
+#include "vmx.h"
 
 #define VCPU_ID 0
 
@@ -106,12 +107,7 @@ int main(int argc, char *argv[])
 {
         struct kvm_vm *vm;
         int rv;
-        uint16_t evmcs_ver;
         struct kvm_cpuid2 *hv_cpuid_entries;
-        struct kvm_enable_cap enable_evmcs_cap = {
-                .cap = KVM_CAP_HYPERV_ENLIGHTENED_VMCS,
-                 .args[0] = (unsigned long)&evmcs_ver
-        };
 
         /* Tell stdout not to buffer its content */
         setbuf(stdout, NULL);
@@ -136,14 +132,14 @@ int main(int argc, char *argv[])
 
         free(hv_cpuid_entries);
 
-        rv = _vcpu_ioctl(vm, VCPU_ID, KVM_ENABLE_CAP, &enable_evmcs_cap);
-
-        if (rv) {
+        if (!kvm_check_cap(KVM_CAP_HYPERV_ENLIGHTENED_VMCS)) {
                 fprintf(stderr,
                         "Enlightened VMCS is unsupported, skip related test\n");
                 goto vm_free;
         }
 
+        vcpu_enable_evmcs(vm, VCPU_ID);
+
         hv_cpuid_entries = kvm_get_supported_hv_cpuid(vm);
         if (!hv_cpuid_entries)
                 return 1;
diff --git a/tools/testing/selftests/kvm/x86_64/platform_info_test.c b/tools/testing/selftests/kvm/x86_64/platform_info_test.c
index 40050e44ec0a..f9334bd3cce9 100644
--- a/tools/testing/selftests/kvm/x86_64/platform_info_test.c
+++ b/tools/testing/selftests/kvm/x86_64/platform_info_test.c
@@ -99,8 +99,8 @@ int main(int argc, char *argv[])
         msr_platform_info = vcpu_get_msr(vm, VCPU_ID, MSR_PLATFORM_INFO);
         vcpu_set_msr(vm, VCPU_ID, MSR_PLATFORM_INFO,
                 msr_platform_info | MSR_PLATFORM_INFO_MAX_TURBO_RATIO);
-        test_msr_platform_info_disabled(vm);
         test_msr_platform_info_enabled(vm);
+        test_msr_platform_info_disabled(vm);
         vcpu_set_msr(vm, VCPU_ID, MSR_PLATFORM_INFO, msr_platform_info);
 
         kvm_vm_free(vm);
diff --git a/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c b/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
index ed7218d166da..853e370e8a39 100644
--- a/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
+++ b/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
@@ -25,24 +25,17 @@
 #define VMCS12_REVISION 0x11e57ed0
 #define VCPU_ID 5
 
+bool have_evmcs;
+
 void test_nested_state(struct kvm_vm *vm, struct kvm_nested_state *state)
 {
-        volatile struct kvm_run *run;
-
         vcpu_nested_state_set(vm, VCPU_ID, state, false);
-        run = vcpu_state(vm, VCPU_ID);
-        vcpu_run(vm, VCPU_ID);
-        TEST_ASSERT(run->exit_reason == KVM_EXIT_SHUTDOWN,
-                "Got exit_reason other than KVM_EXIT_SHUTDOWN: %u (%s),\n",
-                run->exit_reason,
-                exit_reason_str(run->exit_reason));
 }
 
 void test_nested_state_expect_errno(struct kvm_vm *vm,
                                     struct kvm_nested_state *state,
                                     int expected_errno)
 {
-        volatile struct kvm_run *run;
         int rv;
 
         rv = vcpu_nested_state_set(vm, VCPU_ID, state, true);
@@ -50,12 +43,6 @@ void test_nested_state_expect_errno(struct kvm_vm *vm,
                 "Expected %s (%d) from vcpu_nested_state_set but got rv: %i errno: %s (%d)",
                 strerror(expected_errno), expected_errno, rv, strerror(errno),
                 errno);
-        run = vcpu_state(vm, VCPU_ID);
-        vcpu_run(vm, VCPU_ID);
-        TEST_ASSERT(run->exit_reason == KVM_EXIT_SHUTDOWN,
-                "Got exit_reason other than KVM_EXIT_SHUTDOWN: %u (%s),\n",
-                run->exit_reason,
-                exit_reason_str(run->exit_reason));
 }
 
 void test_nested_state_expect_einval(struct kvm_vm *vm,
@@ -90,8 +77,9 @@ void set_default_vmx_state(struct kvm_nested_state *state, int size)
 {
         memset(state, 0, size);
         state->flags = KVM_STATE_NESTED_GUEST_MODE  |
-                        KVM_STATE_NESTED_RUN_PENDING |
-                        KVM_STATE_NESTED_EVMCS;
+                        KVM_STATE_NESTED_RUN_PENDING;
+        if (have_evmcs)
+                state->flags |= KVM_STATE_NESTED_EVMCS;
         state->format = 0;
         state->size = size;
         state->hdr.vmx.vmxon_pa = 0x1000;
@@ -141,13 +129,19 @@ void test_vmx_nested_state(struct kvm_vm *vm)
         /*
          * Setting vmxon_pa == -1ull and vmcs_pa == -1ull exits early without
          * setting the nested state but flags other than eVMCS must be clear.
+         * The eVMCS flag can be set if the enlightened VMCS capability has
+         * been enabled.
          */
         set_default_vmx_state(state, state_sz);
         state->hdr.vmx.vmxon_pa = -1ull;
         state->hdr.vmx.vmcs12_pa = -1ull;
         test_nested_state_expect_einval(vm, state);
 
-        state->flags = KVM_STATE_NESTED_EVMCS;
+        state->flags &= KVM_STATE_NESTED_EVMCS;
+        if (have_evmcs) {
+                test_nested_state_expect_einval(vm, state);
+                vcpu_enable_evmcs(vm, VCPU_ID);
+        }
         test_nested_state(vm, state);
 
         /* It is invalid to have vmxon_pa == -1ull and SMM flags non-zero. */
@@ -232,6 +226,8 @@ int main(int argc, char *argv[])
         struct kvm_nested_state state;
         struct kvm_cpuid_entry2 *entry = kvm_get_supported_cpuid_entry(1);
 
+        have_evmcs = kvm_check_cap(KVM_CAP_HYPERV_ENLIGHTENED_VMCS);
+
         if (!kvm_check_cap(KVM_CAP_NESTED_STATE)) {
                 printf("KVM_CAP_NESTED_STATE not available, skipping test\n");
                 exit(KSFT_SKIP);
diff --git a/tools/testing/selftests/net/tcp_fastopen_backup_key.sh b/tools/testing/selftests/net/tcp_fastopen_backup_key.sh
index 41476399e184..f6e65674b83c 100755
--- a/tools/testing/selftests/net/tcp_fastopen_backup_key.sh
+++ b/tools/testing/selftests/net/tcp_fastopen_backup_key.sh
@@ -30,7 +30,7 @@ do_test() {
         ip netns exec "${NETNS}" ./tcp_fastopen_backup_key "$1"
         val=$(ip netns exec "${NETNS}" nstat -az | \
                 grep TcpExtTCPFastOpenPassiveFail | awk '{print $2}')
-        if [ $val -ne 0 ]; then
+        if [ "$val" != 0 ]; then
                 echo "FAIL: TcpExtTCPFastOpenPassiveFail non-zero"
                 return 1
         fi
diff --git a/tools/testing/selftests/netfilter/nft_flowtable.sh b/tools/testing/selftests/netfilter/nft_flowtable.sh
index fe52488a6f72..16571ac1dab4 100755
--- a/tools/testing/selftests/netfilter/nft_flowtable.sh
+++ b/tools/testing/selftests/netfilter/nft_flowtable.sh
@@ -321,4 +321,52 @@ else
         ip netns exec nsr1 nft list ruleset
 fi
 
+KEY_SHA="0x"$(ps -xaf | sha1sum | cut -d " " -f 1)
+KEY_AES="0x"$(ps -xaf | md5sum | cut -d " " -f 1)
+SPI1=$RANDOM
+SPI2=$RANDOM
+
+if [ $SPI1 -eq $SPI2 ]; then
+        SPI2=$((SPI2+1))
+fi
+
+do_esp() {
+    local ns=$1
+    local me=$2
+    local remote=$3
+    local lnet=$4
+    local rnet=$5
+    local spi_out=$6
+    local spi_in=$7
+
+    ip -net $ns xfrm state add src $remote dst $me proto esp spi $spi_in  enc aes $KEY_AES  auth sha1 $KEY_SHA mode tunnel sel src $rnet dst $lnet
+    ip -net $ns xfrm state add src $me  dst $remote proto esp spi $spi_out enc aes $KEY_AES auth sha1 $KEY_SHA mode tunnel sel src $lnet dst $rnet
+
+    # to encrypt packets as they go out (includes forwarded packets that need encapsulation)
+    ip -net $ns xfrm policy add src $lnet dst $rnet dir out tmpl src $me dst $remote proto esp mode tunnel priority 1 action allow
+    # to fwd decrypted packets after esp processing:
+    ip -net $ns xfrm policy add src $rnet dst $lnet dir fwd tmpl src $remote dst $me proto esp mode tunnel priority 1 action allow
+
+}
+
+do_esp nsr1 192.168.10.1 192.168.10.2 10.0.1.0/24 10.0.2.0/24 $SPI1 $SPI2
+
+do_esp nsr2 192.168.10.2 192.168.10.1 10.0.2.0/24 10.0.1.0/24 $SPI2 $SPI1
+
+ip netns exec nsr1 nft delete table ip nat
+
+# restore default routes
+ip -net ns2 route del 192.168.10.1 via 10.0.2.1
+ip -net ns2 route add default via 10.0.2.1
+ip -net ns2 route add default via dead:2::1
+
+test_tcp_forwarding ns1 ns2
+if [ $? -eq 0 ] ;then
+        echo "PASS: ipsec tunnel mode for ns1/ns2"
+else
+        echo "FAIL: ipsec tunnel mode for ns1/ns2"
+        ip netns exec nsr1 nft list ruleset 1>&2
+        ip netns exec nsr1 cat /proc/net/xfrm_stat 1>&2
+fi
+
 exit $ret
diff --git a/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py b/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
index affa7f2d9670..9539cffa9e5e 100644
--- a/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
+++ b/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
@@ -64,7 +64,7 @@ class SubPlugin(TdcPlugin):
             cmdlist.insert(0, self.args.NAMES['NS'])
             cmdlist.insert(0, 'exec')
             cmdlist.insert(0, 'netns')
-            cmdlist.insert(0, 'ip')
+            cmdlist.insert(0, self.args.NAMES['IP'])
         else:
             pass
 
@@ -78,16 +78,16 @@ class SubPlugin(TdcPlugin):
         return command
 
     def _ports_create(self):
-        cmd = 'ip link add $DEV0 type veth peer name $DEV1'
+        cmd = '$IP link add $DEV0 type veth peer name $DEV1'
         self._exec_cmd('pre', cmd)
-        cmd = 'ip link set $DEV0 up'
+        cmd = '$IP link set $DEV0 up'
         self._exec_cmd('pre', cmd)
         if not self.args.namespace:
-            cmd = 'ip link set $DEV1 up'
+            cmd = '$IP link set $DEV1 up'
             self._exec_cmd('pre', cmd)
 
     def _ports_destroy(self):
-        cmd = 'ip link del $DEV0'
+        cmd = '$IP link del $DEV0'
         self._exec_cmd('post', cmd)
 
     def _ns_create(self):
@@ -97,16 +97,16 @@ class SubPlugin(TdcPlugin):
         '''
         self._ports_create()
         if self.args.namespace:
-            cmd = 'ip netns add {}'.format(self.args.NAMES['NS'])
+            cmd = '$IP netns add {}'.format(self.args.NAMES['NS'])
             self._exec_cmd('pre', cmd)
-            cmd = 'ip link set $DEV1 netns {}'.format(self.args.NAMES['NS'])
+            cmd = '$IP link set $DEV1 netns {}'.format(self.args.NAMES['NS'])
             self._exec_cmd('pre', cmd)
-            cmd = 'ip -n {} link set $DEV1 up'.format(self.args.NAMES['NS'])
+            cmd = '$IP -n {} link set $DEV1 up'.format(self.args.NAMES['NS'])
             self._exec_cmd('pre', cmd)
             if self.args.device:
-                cmd = 'ip link set $DEV2 netns {}'.format(self.args.NAMES['NS'])
+                cmd = '$IP link set $DEV2 netns {}'.format(self.args.NAMES['NS'])
                 self._exec_cmd('pre', cmd)
-                cmd = 'ip -n {} link set $DEV2 up'.format(self.args.NAMES['NS'])
+                cmd = '$IP -n {} link set $DEV2 up'.format(self.args.NAMES['NS'])
                 self._exec_cmd('pre', cmd)
 
     def _ns_destroy(self):
@@ -115,7 +115,7 @@ class SubPlugin(TdcPlugin):
         devices as well)
         '''
         if self.args.namespace:
-            cmd = 'ip netns delete {}'.format(self.args.NAMES['NS'])
+            cmd = '$IP netns delete {}'.format(self.args.NAMES['NS'])
             self._exec_cmd('post', cmd)
 
     def _exec_cmd(self, stage, command):
diff --git a/tools/testing/selftests/tc-testing/tc-tests/actions/skbedit.json b/tools/testing/selftests/tc-testing/tc-tests/actions/skbedit.json
index bf5ebf59c2d4..9cdd2e31ac2c 100644
--- a/tools/testing/selftests/tc-testing/tc-tests/actions/skbedit.json
+++ b/tools/testing/selftests/tc-testing/tc-tests/actions/skbedit.json
@@ -670,5 +670,52 @@
         "teardown": [
             "$TC actions flush action skbedit"
         ]
+    },
+    {
+        "id": "630c",
+        "name": "Add batch of 32 skbedit actions with all parameters and cookie",
+        "category": [
+            "actions",
+            "skbedit"
+        ],
+        "setup": [
+            [
+                "$TC actions flush action skbedit",
+                0,
+                1,
+                255
+            ]
+        ],
+        "cmdUnderTest": "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action skbedit queue_mapping 2 priority 10 mark 7/0xaabbccdd ptype host inheritdsfield index \\$i cookie aabbccddeeff112233445566778800a1 \\\"; args=\"\\$args\\$cmd\"; done && $TC actions add \\$args\"",
+        "expExitCode": "0",
+        "verifyCmd": "$TC actions list action skbedit",
+        "matchPattern": "^[ \t]+index [0-9]+ ref",
+        "matchCount": "32",
+        "teardown": [
+            "$TC actions flush action skbedit"
+        ]
+    },
+    {
+        "id": "706d",
+        "name": "Delete batch of 32 skbedit actions with all parameters",
+        "category": [
+            "actions",
+            "skbedit"
+        ],
+        "setup": [
+            [
+                "$TC actions flush action skbedit",
+                0,
+                1,
+                255
+            ],
+            "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action skbedit queue_mapping 2 priority 10 mark 7/0xaabbccdd ptype host inheritdsfield index \\$i \\\"; args=\\\"\\$args\\$cmd\\\"; done && $TC actions add \\$args\""
+        ],
+        "cmdUnderTest": "bash -c \"for i in \\`seq 1 32\\`; do cmd=\\\"action skbedit index \\$i \\\"; args=\"\\$args\\$cmd\"; done && $TC actions del \\$args\"",
+        "expExitCode": "0",
+        "verifyCmd": "$TC actions list action skbedit",
+        "matchPattern": "^[ \t]+index [0-9]+ ref",
+        "matchCount": "0",
+        "teardown": []
     }
 ]
diff --git a/virt/kvm/arm/mmio.c b/virt/kvm/arm/mmio.c
index a8a6a0c883f1..6af5c91337f2 100644
--- a/virt/kvm/arm/mmio.c
+++ b/virt/kvm/arm/mmio.c
@@ -86,6 +86,12 @@ int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run)
         unsigned int len;
         int mask;
 
+        /* Detect an already handled MMIO return */
+        if (unlikely(!vcpu->mmio_needed))
+                return 0;
+
+        vcpu->mmio_needed = 0;
+
         if (!run->mmio.is_write) {
                 len = run->mmio.len;
                 if (len > sizeof(unsigned long))
@@ -188,6 +194,7 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,
         run->mmio.is_write      = is_write;
         run->mmio.phys_addr     = fault_ipa;
         run->mmio.len           = len;
+        vcpu->mmio_needed       = 1;
 
         if (!ret) {
                 /* We handled the access successfully in the kernel. */
diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c
index bdbc297d06fb..e621b5d45b27 100644
--- a/virt/kvm/arm/vgic/vgic-init.c
+++ b/virt/kvm/arm/vgic/vgic-init.c
@@ -8,6 +8,7 @@
 #include <linux/cpu.h>
 #include <linux/kvm_host.h>
 #include <kvm/arm_vgic.h>
+#include <asm/kvm_emulate.h>
 #include <asm/kvm_mmu.h>
 #include "vgic.h"
 
@@ -164,12 +165,18 @@ static int kvm_vgic_dist_init(struct kvm *kvm, unsigned int nr_spis)
                 irq->vcpu = NULL;
                 irq->target_vcpu = vcpu0;
                 kref_init(&irq->refcount);
-                if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V2) {
+                switch (dist->vgic_model) {
+                case KVM_DEV_TYPE_ARM_VGIC_V2:
                         irq->targets = 0;
                         irq->group = 0;
-                } else {
+                        break;
+                case KVM_DEV_TYPE_ARM_VGIC_V3:
                         irq->mpidr = 0;
                         irq->group = 1;
+                        break;
+                default:
+                        kfree(dist->spis);
+                        return -EINVAL;
                 }
         }
         return 0;
@@ -209,7 +216,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
                 irq->intid = i;
                 irq->vcpu = NULL;
                 irq->target_vcpu = vcpu;
-                irq->targets = 1U << vcpu->vcpu_id;
                 kref_init(&irq->refcount);
                 if (vgic_irq_is_sgi(i)) {
                         /* SGIs */
@@ -219,11 +225,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
                         /* PPIs */
                         irq->config = VGIC_CONFIG_LEVEL;
                 }
-
-                if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3)
-                        irq->group = 1;
-                else
-                        irq->group = 0;
         }
 
         if (!irqchip_in_kernel(vcpu->kvm))
@@ -286,10 +287,19 @@ int vgic_init(struct kvm *kvm)
 
                 for (i = 0; i < VGIC_NR_PRIVATE_IRQS; i++) {
                         struct vgic_irq *irq = &vgic_cpu->private_irqs[i];
-                        if (dist->vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3)
+                        switch (dist->vgic_model) {
+                        case KVM_DEV_TYPE_ARM_VGIC_V3:
                                 irq->group = 1;
-                        else
+                                irq->mpidr = kvm_vcpu_get_mpidr_aff(vcpu);
+                                break;
+                        case KVM_DEV_TYPE_ARM_VGIC_V2:
                                 irq->group = 0;
+                                irq->targets = 1U << idx;
+                                break;
+                        default:
+                                ret = -EINVAL;
+                                goto out;
+                        }
                 }
         }
 
diff --git a/virt/kvm/arm/vgic/vgic-mmio.c b/virt/kvm/arm/vgic/vgic-mmio.c
index 44efc2ff863f..0d090482720d 100644
--- a/virt/kvm/arm/vgic/vgic-mmio.c
+++ b/virt/kvm/arm/vgic/vgic-mmio.c
@@ -211,6 +211,12 @@ static void vgic_hw_irq_spending(struct kvm_vcpu *vcpu, struct vgic_irq *irq,
         vgic_irq_set_phys_active(irq, true);
 }
 
+static bool is_vgic_v2_sgi(struct kvm_vcpu *vcpu, struct vgic_irq *irq)
+{
+        return (vgic_irq_is_sgi(irq->intid) &&
+                vcpu->kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V2);
+}
+
 void vgic_mmio_write_spending(struct kvm_vcpu *vcpu,
                               gpa_t addr, unsigned int len,
                               unsigned long val)
@@ -223,6 +229,12 @@ void vgic_mmio_write_spending(struct kvm_vcpu *vcpu,
         for_each_set_bit(i, &val, len * 8) {
                 struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i);
 
+                /* GICD_ISPENDR0 SGI bits are WI */
+                if (is_vgic_v2_sgi(vcpu, irq)) {
+                        vgic_put_irq(vcpu->kvm, irq);
+                        continue;
+                }
+
                 raw_spin_lock_irqsave(&irq->irq_lock, flags);
                 if (irq->hw)
                         vgic_hw_irq_spending(vcpu, irq, is_uaccess);
@@ -270,6 +282,12 @@ void vgic_mmio_write_cpending(struct kvm_vcpu *vcpu,
         for_each_set_bit(i, &val, len * 8) {
                 struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i);
 
+                /* GICD_ICPENDR0 SGI bits are WI */
+                if (is_vgic_v2_sgi(vcpu, irq)) {
+                        vgic_put_irq(vcpu->kvm, irq);
+                        continue;
+                }
+
                 raw_spin_lock_irqsave(&irq->irq_lock, flags);
 
                 if (irq->hw)
diff --git a/virt/kvm/arm/vgic/vgic-v2.c b/virt/kvm/arm/vgic/vgic-v2.c
index 96aab77d0471..b00aa304c260 100644
--- a/virt/kvm/arm/vgic/vgic-v2.c
+++ b/virt/kvm/arm/vgic/vgic-v2.c
@@ -184,7 +184,10 @@ void vgic_v2_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr)
                 if (vgic_irq_is_sgi(irq->intid)) {
                         u32 src = ffs(irq->source);
 
-                        BUG_ON(!src);
+                        if (WARN_RATELIMIT(!src, "No SGI source for INTID %d\n",
+                                           irq->intid))
+                                return;
+
                         val |= (src - 1) << GICH_LR_PHYSID_CPUID_SHIFT;
                         irq->source &= ~(1 << (src - 1));
                         if (irq->source) {
diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
index 0c653a1e5215..a4ad431c92a9 100644
--- a/virt/kvm/arm/vgic/vgic-v3.c
+++ b/virt/kvm/arm/vgic/vgic-v3.c
@@ -167,7 +167,10 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr)
                     model == KVM_DEV_TYPE_ARM_VGIC_V2) {
                         u32 src = ffs(irq->source);
 
-                        BUG_ON(!src);
+                        if (WARN_RATELIMIT(!src, "No SGI source for INTID %d\n",
+                                           irq->intid))
+                                return;
+
                         val |= (src - 1) << GICH_LR_PHYSID_CPUID_SHIFT;
                         irq->source &= ~(1 << (src - 1));
                         if (irq->source) {
diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c
index 13d4b38a94ec..e7bde65ba67c 100644
--- a/virt/kvm/arm/vgic/vgic.c
+++ b/virt/kvm/arm/vgic/vgic.c
@@ -254,6 +254,13 @@ static int vgic_irq_cmp(void *priv, struct list_head *a, struct list_head *b)
         bool penda, pendb;
         int ret;
 
+        /*
+         * list_sort may call this function with the same element when
+         * the list is fairly long.
+         */
+        if (unlikely(irqa == irqb))
+                return 0;
+
         raw_spin_lock(&irqa->irq_lock);
         raw_spin_lock_nested(&irqb->irq_lock, SINGLE_DEPTH_NESTING);