Merge tag 'dma-mapping-4.18' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping updates from Christoph Hellwig:

 - replace the force_dma flag with a dma_configure bus method. (Nipun
   Gupta, although one patch is іncorrectly attributed to me due to a
   git rebase bug)

 - use GFP_DMA32 more agressively in dma-direct. (Takashi Iwai)

 - remove PCI_DMA_BUS_IS_PHYS and rely on the dma-mapping API to do the
   right thing for bounce buffering.

 - move dma-debug initialization to common code, and apply a few
   cleanups to the dma-debug code.

 - cleanup the Kconfig mess around swiotlb selection

 - swiotlb comment fixup (Yisheng Xie)

 - a trivial swiotlb fix. (Dan Carpenter)

 - support swiotlb on RISC-V. (based on a patch from Palmer Dabbelt)

 - add a new generic dma-noncoherent dma_map_ops implementation and use
   it for arc, c6x and nds32.

 - improve scatterlist validity checking in dma-debug. (Robin Murphy)

 - add a struct device quirk to limit the dma-mask to 32-bit due to
   bridge/system issues, and switch x86 to use it instead of a local
   hack for VIA bridges.

 - handle devices without a dma_mask more gracefully in the dma-direct
   code.

* tag 'dma-mapping-4.18' of git://git.infradead.org/users/hch/dma-mapping: (48 commits)
  dma-direct: don't crash on device without dma_mask
  nds32: use generic dma_noncoherent_ops
  nds32: implement the unmap_sg DMA operation
  nds32: consolidate DMA cache maintainance routines
  x86/pci-dma: switch the VIA 32-bit DMA quirk to use the struct device flag
  x86/pci-dma: remove the explicit nodac and allowdac option
  x86/pci-dma: remove the experimental forcesac boot option
  Documentation/x86: remove a stray reference to pci-nommu.c
  core, dma-direct: add a flag 32-bit dma limits
  dma-mapping: remove unused gfp_t parameter to arch_dma_alloc_attrs
  dma-debug: check scatterlist segments
  c6x: use generic dma_noncoherent_ops
  arc: use generic dma_noncoherent_ops
  arc: fix arc_dma_{map,unmap}_page
  arc: fix arc_dma_sync_sg_for_{cpu,device}
  arc: simplify arc_dma_sync_single_for_{cpu,device}
  dma-mapping: provide a generic dma-noncoherent implementation
  dma-mapping: simplify Kconfig dependencies
  riscv: add swiotlb support
  riscv: only enable ZONE_DMA32 for 64-bit
  ...

141 files changed, 624 insertions, 1392 deletions

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index f2040d46f095..cc0ac035b8fe 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1705,7 +1705,6 @@
                 nopanic
                 merge
                 nomerge
-                forcesac
                 soft
                 pt              [x86, IA-64]
                 nobypass        [PPC/POWERNV]
diff --git a/Documentation/features/io/dma-api-debug/arch-support.txt b/Documentation/features/io/dma-api-debug/arch-support.txt
deleted file mode 100644
index e438ed675623..000000000000
--- a/Documentation/features/io/dma-api-debug/arch-support.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Feature name:          dma-api-debug
-#         Kconfig:       HAVE_DMA_API_DEBUG
-#         description:   arch supports DMA debug facilities
-#
-    -----------------------
-    |         arch |status|
-    -----------------------
-    |       alpha: | TODO |
-    |         arc: | TODO |
-    |         arm: |  ok  |
-    |       arm64: |  ok  |
-    |         c6x: |  ok  |
-    |       h8300: | TODO |
-    |     hexagon: | TODO |
-    |        ia64: |  ok  |
-    |        m68k: | TODO |
-    |  microblaze: |  ok  |
-    |        mips: |  ok  |
-    |       nios2: | TODO |
-    |    openrisc: | TODO |
-    |      parisc: | TODO |
-    |     powerpc: |  ok  |
-    |        s390: |  ok  |
-    |          sh: |  ok  |
-    |       sparc: |  ok  |
-    |          um: | TODO |
-    |   unicore32: | TODO |
-    |         x86: |  ok  |
-    |      xtensa: |  ok  |
-    -----------------------
diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt
index b297c48389b9..8d109ef67ab6 100644
--- a/Documentation/x86/x86_64/boot-options.txt
+++ b/Documentation/x86/x86_64/boot-options.txt
@@ -187,9 +187,9 @@ PCI
 
 IOMMU (input/output memory management unit)
 
- Currently four x86-64 PCI-DMA mapping implementations exist:
+ Multiple x86-64 PCI-DMA mapping implementations exist, for example:
 
-   1. <arch/x86_64/kernel/pci-nommu.c>: use no hardware/software IOMMU at all
+   1. <lib/dma-direct.c>: use no hardware/software IOMMU at all
       (e.g. because you have < 3 GB memory).
       Kernel boot message: "PCI-DMA: Disabling IOMMU"
 
@@ -208,7 +208,7 @@ IOMMU (input/output memory management unit)
       Kernel boot message: "PCI-DMA: Using Calgary IOMMU"
 
  iommu=[<size>][,noagp][,off][,force][,noforce][,leak[=<nr_of_leak_pages>]
-        [,memaper[=<order>]][,merge][,forcesac][,fullflush][,nomerge]
+        [,memaper[=<order>]][,merge][,fullflush][,nomerge]
         [,noaperture][,calgary]
 
   General iommu options:
@@ -235,14 +235,7 @@ IOMMU (input/output memory management unit)
                        (experimental).
     nomerge            Don't do scatter-gather (SG) merging.
     noaperture         Ask the IOMMU not to touch the aperture for AGP.
-    forcesac           Force single-address cycle (SAC) mode for masks <40bits
-                       (experimental).
     noagp              Don't initialize the AGP driver and use full aperture.
-    allowdac           Allow double-address cycle (DAC) mode, i.e. DMA >4GB.
-                       DAC is used with 32-bit PCI to push a 64-bit address in
-                       two cycles. When off all DMA over >4GB is forced through
-                       an IOMMU or software bounce buffering.
-    nodac              Forbid DAC mode, i.e. DMA >4GB.
     panic              Always panic when IOMMU overflows.
     calgary            Use the Calgary IOMMU if it is available
 
diff --git a/MAINTAINERS b/MAINTAINERS
index cbc6bbf4ef9c..0c411a53b424 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4330,12 +4330,14 @@ W:	http://git.infradead.org/users/hch/dma-mapping.git
 S:      Supported
 F:      lib/dma-debug.c
 F:      lib/dma-direct.c
+F:      lib/dma-noncoherent.c
 F:      lib/dma-virt.c
 F:      drivers/base/dma-mapping.c
 F:      drivers/base/dma-coherent.c
 F:      include/asm-generic/dma-mapping.h
 F:      include/linux/dma-direct.h
 F:      include/linux/dma-mapping.h
+F:      include/linux/dma-noncoherent.h
 
 DME1737 HARDWARE MONITOR DRIVER
 M:      Juerg Haefliger <juergh@gmail.com>
diff --git a/arch/Kconfig b/arch/Kconfig
index 75dd23acf133..b624634daea6 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -278,9 +278,6 @@ config HAVE_CLK
           The <linux/clk.h> calls support software clock gating and
           thus are a key power management tool on many systems.
 
-config HAVE_DMA_API_DEBUG
-        bool
-
 config HAVE_HW_BREAKPOINT
         bool
         depends on PERF_EVENTS
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index f19dc31288c8..94af0c7f494a 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -10,6 +10,8 @@ config ALPHA
         select HAVE_OPROFILE
         select HAVE_PCSPKR_PLATFORM
         select HAVE_PERF_EVENTS
+        select NEED_DMA_MAP_STATE
+        select NEED_SG_DMA_LENGTH
         select VIRT_TO_BUS
         select GENERIC_IRQ_PROBE
         select AUTO_IRQ_AFFINITY if SMP
@@ -64,15 +66,6 @@ config ZONE_DMA
         bool
         default y
 
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool y
-
-config NEED_DMA_MAP_STATE
-       def_bool y
-
-config NEED_SG_DMA_LENGTH
-        def_bool y
-
 config GENERIC_ISA_DMA
         bool
         default y
@@ -346,9 +339,6 @@ config PCI_DOMAINS
 config PCI_SYSCALL
         def_bool PCI
 
-config IOMMU_HELPER
-        def_bool PCI
-
 config ALPHA_NONAME
         bool
         depends on ALPHA_BOOK1 || ALPHA_NONAME_CH
diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h
index b9ec55351924..cf6bc1e64d66 100644
--- a/arch/alpha/include/asm/pci.h
+++ b/arch/alpha/include/asm/pci.h
@@ -56,11 +56,6 @@ struct pci_controller {
 
 /* IOMMU controls.  */
 
-/* The PCI address space does not equal the physical memory address space.
-   The networking and block device layers use this boolean for bounce buffer
-   decisions.  */
-#define PCI_DMA_BUS_IS_PHYS  0
-
 /* TODO: integrate with include/asm-generic/pci.h ? */
 static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 {
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index d76bf4a83740..89d47eac18b2 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -9,11 +9,15 @@
 config ARC
         def_bool y
         select ARC_TIMERS
+        select ARCH_HAS_SYNC_DMA_FOR_CPU
+        select ARCH_HAS_SYNC_DMA_FOR_DEVICE
         select ARCH_HAS_SG_CHAIN
         select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC
         select BUILDTIME_EXTABLE_SORT
         select CLONE_BACKWARDS
         select COMMON_CLK
+        select DMA_NONCOHERENT_OPS
+        select DMA_NONCOHERENT_MMAP
         select GENERIC_ATOMIC64 if !ISA_ARCV2 || !(ARC_HAS_LL64 && ARC_HAS_LLSC)
         select GENERIC_CLOCKEVENTS
         select GENERIC_FIND_FIRST_BIT
@@ -453,16 +457,11 @@ config ARC_HAS_PAE40
         default n
         depends on ISA_ARCV2
         select HIGHMEM
+        select PHYS_ADDR_T_64BIT
         help
           Enable access to physical memory beyond 4G, only supported on
           ARC cores with 40 bit Physical Addressing support
 
-config ARCH_PHYS_ADDR_T_64BIT
-        def_bool ARC_HAS_PAE40
-
-config ARCH_DMA_ADDR_T_64BIT
-        bool
-
 config ARC_KVADDR_SIZE
         int "Kernel Virtual Address Space size (MB)"
         range 0 512
diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild
index 4bd5d4369e05..bbdcb955e18f 100644
--- a/arch/arc/include/asm/Kbuild
+++ b/arch/arc/include/asm/Kbuild
@@ -2,6 +2,7 @@
 generic-y += bugs.h
 generic-y += device.h
 generic-y += div64.h
+generic-y += dma-mapping.h
 generic-y += emergency-restart.h
 generic-y += extable.h
 generic-y += fb.h
diff --git a/arch/arc/include/asm/dma-mapping.h b/arch/arc/include/asm/dma-mapping.h
deleted file mode 100644
index 7a16824bfe98..000000000000
--- a/arch/arc/include/asm/dma-mapping.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * DMA Mapping glue for ARC
- *
- * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef ASM_ARC_DMA_MAPPING_H
-#define ASM_ARC_DMA_MAPPING_H
-
-extern const struct dma_map_ops arc_dma_ops;
-
-static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
-{
-        return &arc_dma_ops;
-}
-
-#endif
diff --git a/arch/arc/include/asm/pci.h b/arch/arc/include/asm/pci.h
index ba56c23c1b20..4ff53c041c64 100644
--- a/arch/arc/include/asm/pci.h
+++ b/arch/arc/include/asm/pci.h
@@ -16,12 +16,6 @@
 #define PCIBIOS_MIN_MEM 0x100000
 
 #define pcibios_assign_all_busses()     1
-/*
- * The PCI address space does equal the physical memory address space.
- * The networking and block device layers use this boolean for bounce
- * buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     1
 
 #endif /* __KERNEL__ */
 
diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c
index 1dcc404b5aec..8c1071840979 100644
--- a/arch/arc/mm/dma.c
+++ b/arch/arc/mm/dma.c
@@ -16,13 +16,12 @@
  * The default DMA address == Phy address which is 0x8000_0000 based.
  */
 
-#include <linux/dma-mapping.h>
+#include <linux/dma-noncoherent.h>
 #include <asm/cache.h>
 #include <asm/cacheflush.h>
 
-
-static void *arc_dma_alloc(struct device *dev, size_t size,
-                dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)
+void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
+                gfp_t gfp, unsigned long attrs)
 {
         unsigned long order = get_order(size);
         struct page *page;
@@ -89,7 +88,7 @@ static void *arc_dma_alloc(struct device *dev, size_t size,
         return kvaddr;
 }
 
-static void arc_dma_free(struct device *dev, size_t size, void *vaddr,
+void arch_dma_free(struct device *dev, size_t size, void *vaddr,
                 dma_addr_t dma_handle, unsigned long attrs)
 {
         phys_addr_t paddr = dma_handle;
@@ -105,9 +104,9 @@ static void arc_dma_free(struct device *dev, size_t size, void *vaddr,
         __free_pages(page, get_order(size));
 }
 
-static int arc_dma_mmap(struct device *dev, struct vm_area_struct *vma,
-                        void *cpu_addr, dma_addr_t dma_addr, size_t size,
-                        unsigned long attrs)
+int arch_dma_mmap(struct device *dev, struct vm_area_struct *vma,
+                void *cpu_addr, dma_addr_t dma_addr, size_t size,
+                unsigned long attrs)
 {
         unsigned long user_count = vma_pages(vma);
         unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT;
@@ -130,149 +129,14 @@ static int arc_dma_mmap(struct device *dev, struct vm_area_struct *vma,
         return ret;
 }
 
-/*
- * streaming DMA Mapping API...
- * CPU accesses page via normal paddr, thus needs to explicitly made
- * consistent before each use
- */
-static void _dma_cache_sync(phys_addr_t paddr, size_t size,
-                enum dma_data_direction dir)
+void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr,
+                size_t size, enum dma_data_direction dir)
 {
-        switch (dir) {
-        case DMA_FROM_DEVICE:
-                dma_cache_inv(paddr, size);
-                break;
-        case DMA_TO_DEVICE:
-                dma_cache_wback(paddr, size);
-                break;
-        case DMA_BIDIRECTIONAL:
-                dma_cache_wback_inv(paddr, size);
-                break;
-        default:
-                pr_err("Invalid DMA dir [%d] for OP @ %pa[p]\n", dir, &paddr);
-        }
+        dma_cache_wback(paddr, size);
 }
 
-/*
- * arc_dma_map_page - map a portion of a page for streaming DMA
- *
- * Ensure that any data held in the cache is appropriately discarded
- * or written back.
- *
- * The device owns this memory once this call has completed.  The CPU
- * can regain ownership by calling dma_unmap_page().
- *
- * Note: while it takes struct page as arg, caller can "abuse" it to pass
- * a region larger than PAGE_SIZE, provided it is physically contiguous
- * and this still works correctly
- */
-static dma_addr_t arc_dma_map_page(struct device *dev, struct page *page,
-                unsigned long offset, size_t size, enum dma_data_direction dir,
-                unsigned long attrs)
+void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,
+                size_t size, enum dma_data_direction dir)
 {
-        phys_addr_t paddr = page_to_phys(page) + offset;
-
-        if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
-                _dma_cache_sync(paddr, size, dir);
-
-        return paddr;
-}
-
-/*
- * arc_dma_unmap_page - unmap a buffer previously mapped through dma_map_page()
- *
- * After this call, reads by the CPU to the buffer are guaranteed to see
- * whatever the device wrote there.
- *
- * Note: historically this routine was not implemented for ARC
- */
-static void arc_dma_unmap_page(struct device *dev, dma_addr_t handle,
-                               size_t size, enum dma_data_direction dir,
-                               unsigned long attrs)
-{
-        phys_addr_t paddr = handle;
-
-        if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
-                _dma_cache_sync(paddr, size, dir);
+        dma_cache_inv(paddr, size);
 }
-
-static int arc_dma_map_sg(struct device *dev, struct scatterlist *sg,
-           int nents, enum dma_data_direction dir, unsigned long attrs)
-{
-        struct scatterlist *s;
-        int i;
-
-        for_each_sg(sg, s, nents, i)
-                s->dma_address = dma_map_page(dev, sg_page(s), s->offset,
-                                               s->length, dir);
-
-        return nents;
-}
-
-static void arc_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
-                             int nents, enum dma_data_direction dir,
-                             unsigned long attrs)
-{
-        struct scatterlist *s;
-        int i;
-
-        for_each_sg(sg, s, nents, i)
-                arc_dma_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir,
-                                   attrs);
-}
-
-static void arc_dma_sync_single_for_cpu(struct device *dev,
-                dma_addr_t dma_handle, size_t size, enum dma_data_direction dir)
-{
-        _dma_cache_sync(dma_handle, size, DMA_FROM_DEVICE);
-}
-
-static void arc_dma_sync_single_for_device(struct device *dev,
-                dma_addr_t dma_handle, size_t size, enum dma_data_direction dir)
-{
-        _dma_cache_sync(dma_handle, size, DMA_TO_DEVICE);
-}
-
-static void arc_dma_sync_sg_for_cpu(struct device *dev,
-                struct scatterlist *sglist, int nelems,
-                enum dma_data_direction dir)
-{
-        int i;
-        struct scatterlist *sg;
-
-        for_each_sg(sglist, sg, nelems, i)
-                _dma_cache_sync(sg_phys(sg), sg->length, dir);
-}
-
-static void arc_dma_sync_sg_for_device(struct device *dev,
-                struct scatterlist *sglist, int nelems,
-                enum dma_data_direction dir)
-{
-        int i;
-        struct scatterlist *sg;
-
-        for_each_sg(sglist, sg, nelems, i)
-                _dma_cache_sync(sg_phys(sg), sg->length, dir);
-}
-
-static int arc_dma_supported(struct device *dev, u64 dma_mask)
-{
-        /* Support 32 bit DMA mask exclusively */
-        return dma_mask == DMA_BIT_MASK(32);
-}
-
-const struct dma_map_ops arc_dma_ops = {
-        .alloc                  = arc_dma_alloc,
-        .free                   = arc_dma_free,
-        .mmap                   = arc_dma_mmap,
-        .map_page               = arc_dma_map_page,
-        .unmap_page             = arc_dma_unmap_page,
-        .map_sg                 = arc_dma_map_sg,
-        .unmap_sg               = arc_dma_unmap_sg,
-        .sync_single_for_device = arc_dma_sync_single_for_device,
-        .sync_single_for_cpu    = arc_dma_sync_single_for_cpu,
-        .sync_sg_for_cpu        = arc_dma_sync_sg_for_cpu,
-        .sync_sg_for_device     = arc_dma_sync_sg_for_device,
-        .dma_supported          = arc_dma_supported,
-};
-EXPORT_SYMBOL(arc_dma_ops);
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a7f8e7f4b88f..c43f5bb55ac8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -60,7 +60,6 @@ config ARM
         select HAVE_CONTEXT_TRACKING
         select HAVE_C_RECORDMCOUNT
         select HAVE_DEBUG_KMEMLEAK
-        select HAVE_DMA_API_DEBUG
         select HAVE_DMA_CONTIGUOUS if MMU
         select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) && !CPU_ENDIAN_BE32 && MMU
         select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
@@ -96,6 +95,7 @@ config ARM
         select HAVE_VIRT_CPU_ACCOUNTING_GEN
         select IRQ_FORCED_THREADING
         select MODULES_USE_ELF_REL
+        select NEED_DMA_MAP_STATE
         select NO_BOOTMEM
         select OF_EARLY_FLATTREE if OF
         select OF_RESERVED_MEM if OF
@@ -119,9 +119,6 @@ config ARM_HAS_SG_CHAIN
         select ARCH_HAS_SG_CHAIN
         bool
 
-config NEED_SG_DMA_LENGTH
-        bool
-
 config ARM_DMA_USE_IOMMU
         bool
         select ARM_HAS_SG_CHAIN
@@ -224,9 +221,6 @@ config ARCH_MAY_HAVE_PC_FDC
 config ZONE_DMA
         bool
 
-config NEED_DMA_MAP_STATE
-       def_bool y
-
 config ARCH_SUPPORTS_UPROBES
         def_bool y
 
@@ -1778,12 +1772,6 @@ config SECCOMP
           and the task is only allowed to execute a few safe syscalls
           defined by each seccomp mode.
 
-config SWIOTLB
-        def_bool y
-
-config IOMMU_HELPER
-        def_bool SWIOTLB
-
 config PARAVIRT
         bool "Enable paravirtualization code"
         help
@@ -1815,6 +1803,7 @@ config XEN
         depends on MMU
         select ARCH_DMA_ADDR_T_64BIT
         select ARM_PSCI
+        select SWIOTLB
         select SWIOTLB_XEN
         select PARAVIRT
         help
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h
index 1f0de808d111..0abd389cf0ec 100644
--- a/arch/arm/include/asm/pci.h
+++ b/arch/arm/include/asm/pci.h
@@ -19,13 +19,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)
 }
 #endif /* CONFIG_PCI_DOMAINS */
 
-/*
- * The PCI address space does equal the physical memory address space.
- * The networking and block device layers use this boolean for bounce
- * buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (1)
-
 #define HAVE_PCI_MMAP
 #define ARCH_GENERIC_PCI_MMAP_RESOURCE
 
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index fc40a2b40595..35ca494c028c 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -754,7 +754,7 @@ int __init arm_add_memory(u64 start, u64 size)
         else
                 size -= aligned_start - start;
 
-#ifndef CONFIG_ARCH_PHYS_ADDR_T_64BIT
+#ifndef CONFIG_PHYS_ADDR_T_64BIT
         if (aligned_start > ULONG_MAX) {
                 pr_crit("Ignoring memory at 0x%08llx outside 32-bit physical address space\n",
                         (long long)start);
diff --git a/arch/arm/mach-axxia/Kconfig b/arch/arm/mach-axxia/Kconfig
index bb2ce1c63fd9..d3eae6037913 100644
--- a/arch/arm/mach-axxia/Kconfig
+++ b/arch/arm/mach-axxia/Kconfig
@@ -2,7 +2,6 @@
 config ARCH_AXXIA
         bool "LSI Axxia platforms"
         depends on ARCH_MULTI_V7 && ARM_LPAE
-        select ARCH_DMA_ADDR_T_64BIT
         select ARM_AMBA
         select ARM_GIC
         select ARM_TIMER_SP804
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index c2f3b0d216a4..c46a728df44e 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -211,7 +211,6 @@ config ARCH_BRCMSTB
         select BRCMSTB_L2_IRQ
         select BCM7120_L2_IRQ
         select ARCH_HAS_HOLES_MEMORYMODEL
-        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
         select ZONE_DMA if ARM_LPAE
         select SOC_BRCMSTB
         select SOC_BUS
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 647c319f9f5f..2ca405816846 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -112,7 +112,6 @@ config SOC_EXYNOS5440
         bool "SAMSUNG EXYNOS5440"
         default y
         depends on ARCH_EXYNOS5
-        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
         select HAVE_ARM_ARCH_TIMER
         select AUTO_ZRELADDR
         select PINCTRL_EXYNOS5440
diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
index 81110ec34226..5552968f07f8 100644
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@ -1,7 +1,6 @@
 config ARCH_HIGHBANK
         bool "Calxeda ECX-1000/2000 (Highbank/Midway)"
         depends on ARCH_MULTI_V7
-        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
         select ARCH_HAS_HOLES_MEMORYMODEL
         select ARCH_SUPPORTS_BIG_ENDIAN
         select ARM_AMBA
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index a4065966881a..fafd3d7f9f8c 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -3,7 +3,6 @@ config ARCH_ROCKCHIP
         depends on ARCH_MULTI_V7
         select PINCTRL
         select PINCTRL_ROCKCHIP
-        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
         select ARCH_HAS_RESET_CONTROLLER
         select ARM_AMBA
         select ARM_GIC
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 280e7312a9e1..fe60cd09a5ca 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -29,7 +29,6 @@ config ARCH_RMOBILE
 menuconfig ARCH_RENESAS
         bool "Renesas ARM SoCs"
         depends on ARCH_MULTI_V7 && MMU
-        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
         select ARCH_SHMOBILE
         select ARM_GIC
         select GPIOLIB
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 1e0aeb47bac6..7f3b83e0d324 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -15,6 +15,5 @@ menuconfig ARCH_TEGRA
         select RESET_CONTROLLER
         select SOC_BUS
         select ZONE_DMA if ARM_LPAE
-        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
         help
           This enables support for NVIDIA Tegra based systems.
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 7f14acf67caf..5a016bc80e26 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -661,6 +661,7 @@ config ARM_LPAE
         bool "Support for the Large Physical Address Extension"
         depends on MMU && CPU_32v7 && !CPU_32v6 && !CPU_32v5 && \
                 !CPU_32v4 && !CPU_32v3
+        select PHYS_ADDR_T_64BIT
         help
           Say Y if you have an ARMv7 processor supporting the LPAE page
           table format and you would like to access memory beyond the
@@ -673,12 +674,6 @@ config ARM_PV_FIXUP
         def_bool y
         depends on ARM_LPAE && ARM_PATCH_PHYS_VIRT && ARCH_KEYSTONE
 
-config ARCH_PHYS_ADDR_T_64BIT
-        def_bool ARM_LPAE
-
-config ARCH_DMA_ADDR_T_64BIT
-        bool
-
 config ARM_THUMB
         bool "Support Thumb user binaries" if !CPU_THUMBONLY && EXPERT
         depends on CPU_THUMB_CAPABLE
diff --git a/arch/arm/mm/dma-mapping-nommu.c b/arch/arm/mm/dma-mapping-nommu.c
index 619f24a42d09..f448a0663b10 100644
--- a/arch/arm/mm/dma-mapping-nommu.c
+++ b/arch/arm/mm/dma-mapping-nommu.c
@@ -241,12 +241,3 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
 void arch_teardown_dma_ops(struct device *dev)
 {
 }
-
-#define PREALLOC_DMA_DEBUG_ENTRIES      4096
-
-static int __init dma_debug_do_init(void)
-{
-        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
-        return 0;
-}
-core_initcall(dma_debug_do_init);
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index ada8eb206a90..4b6613b5e042 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1151,15 +1151,6 @@ int arm_dma_supported(struct device *dev, u64 mask)
         return __dma_supported(dev, mask, false);
 }
 
-#define PREALLOC_DMA_DEBUG_ENTRIES      4096
-
-static int __init dma_debug_do_init(void)
-{
-        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
-        return 0;
-}
-core_initcall(dma_debug_do_init);
-
 #ifdef CONFIG_ARM_DMA_USE_IOMMU
 
 static int __dma_info_to_prot(enum dma_data_direction dir, unsigned long attrs)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index eb2cf4938f6d..b25ed7834f6c 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -105,7 +105,6 @@ config ARM64
         select HAVE_CONTEXT_TRACKING
         select HAVE_DEBUG_BUGVERBOSE
         select HAVE_DEBUG_KMEMLEAK
-        select HAVE_DMA_API_DEBUG
         select HAVE_DMA_CONTIGUOUS
         select HAVE_DYNAMIC_FTRACE
         select HAVE_EFFICIENT_UNALIGNED_ACCESS
@@ -133,6 +132,8 @@ config ARM64
         select IRQ_FORCED_THREADING
         select MODULES_USE_ELF_RELA
         select MULTI_IRQ_HANDLER
+        select NEED_DMA_MAP_STATE
+        select NEED_SG_DMA_LENGTH
         select NO_BOOTMEM
         select OF
         select OF_EARLY_FLATTREE
@@ -142,6 +143,7 @@ config ARM64
         select POWER_SUPPLY
         select REFCOUNT_FULL
         select SPARSE_IRQ
+        select SWIOTLB
         select SYSCTL_EXCEPTION_TRACE
         select THREAD_INFO_IN_TASK
         help
@@ -150,9 +152,6 @@ config ARM64
 config 64BIT
         def_bool y
 
-config ARCH_PHYS_ADDR_T_64BIT
-        def_bool y
-
 config MMU
         def_bool y
 
@@ -237,24 +236,9 @@ config ZONE_DMA32
 config HAVE_GENERIC_GUP
         def_bool y
 
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool y
-
-config NEED_DMA_MAP_STATE
-        def_bool y
-
-config NEED_SG_DMA_LENGTH
-        def_bool y
-
 config SMP
         def_bool y
 
-config SWIOTLB
-        def_bool y
-
-config IOMMU_HELPER
-        def_bool SWIOTLB
-
 config KERNEL_MODE_NEON
         def_bool y
 
diff --git a/arch/arm64/include/asm/pci.h b/arch/arm64/include/asm/pci.h
index 8747f7c5e0e7..9e690686e8aa 100644
--- a/arch/arm64/include/asm/pci.h
+++ b/arch/arm64/include/asm/pci.h
@@ -18,11 +18,6 @@
 #define pcibios_assign_all_busses() \
         (pci_has_flag(PCI_REASSIGN_ALL_BUS))
 
-/*
- * PCI address space differs from physical memory address space
- */
-#define PCI_DMA_BUS_IS_PHYS     (0)
-
 #define ARCH_GENERIC_PCI_MMAP_RESOURCE  1
 
 extern int isa_dma_bridge_buggy;
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index a96ec0181818..db01f2709842 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -508,16 +508,6 @@ static int __init arm64_dma_init(void)
 }
 arch_initcall(arm64_dma_init);
 
-#define PREALLOC_DMA_DEBUG_ENTRIES      4096
-
-static int __init dma_debug_do_init(void)
-{
-        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
-        return 0;
-}
-fs_initcall(dma_debug_do_init);
-
-
 #ifdef CONFIG_IOMMU_DMA
 #include <linux/dma-iommu.h>
 #include <linux/platform_device.h>
diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index c6b4dd1418b4..bf59855628ac 100644
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -6,11 +6,13 @@
 
 config C6X
         def_bool y
+        select ARCH_HAS_SYNC_DMA_FOR_CPU
+        select ARCH_HAS_SYNC_DMA_FOR_DEVICE
         select CLKDEV_LOOKUP
+        select DMA_NONCOHERENT_OPS
         select GENERIC_ATOMIC64
         select GENERIC_IRQ_SHOW
         select HAVE_ARCH_TRACEHOOK
-        select HAVE_DMA_API_DEBUG
         select HAVE_MEMBLOCK
         select SPARSE_IRQ
         select IRQ_DOMAIN
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index fd4c840de837..434600e47662 100644
--- a/arch/c6x/include/asm/Kbuild
+++ b/arch/c6x/include/asm/Kbuild
@@ -5,6 +5,7 @@ generic-y += current.h
 generic-y += device.h
 generic-y += div64.h
 generic-y += dma.h
+generic-y += dma-mapping.h
 generic-y += emergency-restart.h
 generic-y += exec.h
 generic-y += extable.h
diff --git a/arch/c6x/include/asm/dma-mapping.h b/arch/c6x/include/asm/dma-mapping.h
deleted file mode 100644
index 05daf1038111..000000000000
--- a/arch/c6x/include/asm/dma-mapping.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Port on Texas Instruments TMS320C6x architecture
- *
- *  Copyright (C) 2004, 2009, 2010, 2011 Texas Instruments Incorporated
- *  Author: Aurelien Jacquiot <aurelien.jacquiot@ti.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- */
-#ifndef _ASM_C6X_DMA_MAPPING_H
-#define _ASM_C6X_DMA_MAPPING_H
-
-extern const struct dma_map_ops c6x_dma_ops;
-
-static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
-{
-        return &c6x_dma_ops;
-}
-
-extern void coherent_mem_init(u32 start, u32 size);
-void *c6x_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
-                gfp_t gfp, unsigned long attrs);
-void c6x_dma_free(struct device *dev, size_t size, void *vaddr,
-                dma_addr_t dma_handle, unsigned long attrs);
-
-#endif  /* _ASM_C6X_DMA_MAPPING_H */
diff --git a/arch/c6x/include/asm/setup.h b/arch/c6x/include/asm/setup.h
index 852afb209afb..350f34debb19 100644
--- a/arch/c6x/include/asm/setup.h
+++ b/arch/c6x/include/asm/setup.h
@@ -28,5 +28,7 @@ extern unsigned char c6x_fuse_mac[6];
 extern void machine_init(unsigned long dt_ptr);
 extern void time_init(void);
 
+extern void coherent_mem_init(u32 start, u32 size);
+
 #endif /* !__ASSEMBLY__ */
 #endif /* _ASM_C6X_SETUP_H */
diff --git a/arch/c6x/kernel/Makefile b/arch/c6x/kernel/Makefile
index 02f340d7b8fe..fbe74174de87 100644
--- a/arch/c6x/kernel/Makefile
+++ b/arch/c6x/kernel/Makefile
@@ -8,6 +8,6 @@ extra-y := head.o vmlinux.lds
 obj-y := process.o traps.o irq.o signal.o ptrace.o
 obj-y += setup.o sys_c6x.o time.o devicetree.o
 obj-y += switch_to.o entry.o vectors.o c6x_ksyms.o
-obj-y += soc.o dma.o
+obj-y += soc.o
 
 obj-$(CONFIG_MODULES)           += module.o
diff --git a/arch/c6x/kernel/dma.c b/arch/c6x/kernel/dma.c
deleted file mode 100644
index 9fff8be75f58..000000000000
--- a/arch/c6x/kernel/dma.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *  Copyright (C) 2011 Texas Instruments Incorporated
- *  Author: Mark Salter <msalter@redhat.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- */
-#include <linux/module.h>
-#include <linux/dma-mapping.h>
-#include <linux/mm.h>
-#include <linux/mm_types.h>
-#include <linux/scatterlist.h>
-
-#include <asm/cacheflush.h>
-
-static void c6x_dma_sync(dma_addr_t handle, size_t size,
-                         enum dma_data_direction dir)
-{
-        unsigned long paddr = handle;
-
-        BUG_ON(!valid_dma_direction(dir));
-
-        switch (dir) {
-        case DMA_FROM_DEVICE:
-                L2_cache_block_invalidate(paddr, paddr + size);
-                break;
-        case DMA_TO_DEVICE:
-                L2_cache_block_writeback(paddr, paddr + size);
-                break;
-        case DMA_BIDIRECTIONAL:
-                L2_cache_block_writeback_invalidate(paddr, paddr + size);
-                break;
-        default:
-                break;
-        }
-}
-
-static dma_addr_t c6x_dma_map_page(struct device *dev, struct page *page,
-                unsigned long offset, size_t size, enum dma_data_direction dir,
-                unsigned long attrs)
-{
-        dma_addr_t handle = virt_to_phys(page_address(page) + offset);
-
-        if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
-                c6x_dma_sync(handle, size, dir);
-
-        return handle;
-}
-
-static void c6x_dma_unmap_page(struct device *dev, dma_addr_t handle,
-                size_t size, enum dma_data_direction dir, unsigned long attrs)
-{
-        if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
-                c6x_dma_sync(handle, size, dir);
-}
-
-static int c6x_dma_map_sg(struct device *dev, struct scatterlist *sglist,
-                int nents, enum dma_data_direction dir, unsigned long attrs)
-{
-        struct scatterlist *sg;
-        int i;
-
-        for_each_sg(sglist, sg, nents, i) {
-                sg->dma_address = sg_phys(sg);
-                if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
-                        c6x_dma_sync(sg->dma_address, sg->length, dir);
-        }
-
-        return nents;
-}
-
-static void c6x_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,
-                  int nents, enum dma_data_direction dir, unsigned long attrs)
-{
-        struct scatterlist *sg;
-        int i;
-
-        if (attrs & DMA_ATTR_SKIP_CPU_SYNC)
-                return;
-
-        for_each_sg(sglist, sg, nents, i)
-                c6x_dma_sync(sg_dma_address(sg), sg->length, dir);
-}
-
-static void c6x_dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle,
-                size_t size, enum dma_data_direction dir)
-{
-        c6x_dma_sync(handle, size, dir);
-
-}
-
-static void c6x_dma_sync_single_for_device(struct device *dev,
-                dma_addr_t handle, size_t size, enum dma_data_direction dir)
-{
-        c6x_dma_sync(handle, size, dir);
-
-}
-
-static void c6x_dma_sync_sg_for_cpu(struct device *dev,
-                struct scatterlist *sglist, int nents,
-                enum dma_data_direction dir)
-{
-        struct scatterlist *sg;
-        int i;
-
-        for_each_sg(sglist, sg, nents, i)
-                c6x_dma_sync_single_for_cpu(dev, sg_dma_address(sg),
-                                        sg->length, dir);
-
-}
-
-static void c6x_dma_sync_sg_for_device(struct device *dev,
-                struct scatterlist *sglist, int nents,
-                enum dma_data_direction dir)
-{
-        struct scatterlist *sg;
-        int i;
-
-        for_each_sg(sglist, sg, nents, i)
-                c6x_dma_sync_single_for_device(dev, sg_dma_address(sg),
-                                           sg->length, dir);
-
-}
-
-const struct dma_map_ops c6x_dma_ops = {
-        .alloc                  = c6x_dma_alloc,
-        .free                   = c6x_dma_free,
-        .map_page               = c6x_dma_map_page,
-        .unmap_page             = c6x_dma_unmap_page,
-        .map_sg                 = c6x_dma_map_sg,
-        .unmap_sg               = c6x_dma_unmap_sg,
-        .sync_single_for_device = c6x_dma_sync_single_for_device,
-        .sync_single_for_cpu    = c6x_dma_sync_single_for_cpu,
-        .sync_sg_for_device     = c6x_dma_sync_sg_for_device,
-        .sync_sg_for_cpu        = c6x_dma_sync_sg_for_cpu,
-};
-EXPORT_SYMBOL(c6x_dma_ops);
-
-/* Number of entries preallocated for DMA-API debugging */
-#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
-
-static int __init dma_init(void)
-{
-        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
-
-        return 0;
-}
-fs_initcall(dma_init);
diff --git a/arch/c6x/mm/dma-coherent.c b/arch/c6x/mm/dma-coherent.c
index 95e38ad27c69..d0a8e0c4b27e 100644
--- a/arch/c6x/mm/dma-coherent.c
+++ b/arch/c6x/mm/dma-coherent.c
@@ -19,10 +19,12 @@
 #include <linux/bitops.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
-#include <linux/dma-mapping.h>
+#include <linux/dma-noncoherent.h>
 #include <linux/memblock.h>
 
+#include <asm/cacheflush.h>
 #include <asm/page.h>
+#include <asm/setup.h>
 
 /*
  * DMA coherent memory management, can be redefined using the memdma=
@@ -73,7 +75,7 @@ static void __free_dma_pages(u32 addr, int order)
  * Allocate DMA coherent memory space and return both the kernel
  * virtual and DMA address for that space.
  */
-void *c6x_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
+void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
                 gfp_t gfp, unsigned long attrs)
 {
         u32 paddr;
@@ -98,7 +100,7 @@ void *c6x_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
 /*
  * Free DMA coherent memory as defined by the above mapping.
  */
-void c6x_dma_free(struct device *dev, size_t size, void *vaddr,
+void arch_dma_free(struct device *dev, size_t size, void *vaddr,
                 dma_addr_t dma_handle, unsigned long attrs)
 {
         int order;
@@ -139,3 +141,35 @@ void __init coherent_mem_init(phys_addr_t start, u32 size)
         dma_bitmap = phys_to_virt(bitmap_phys);
         memset(dma_bitmap, 0, dma_pages * PAGE_SIZE);
 }
+
+static void c6x_dma_sync(struct device *dev, phys_addr_t paddr, size_t size,
+                enum dma_data_direction dir)
+{
+        BUG_ON(!valid_dma_direction(dir));
+
+        switch (dir) {
+        case DMA_FROM_DEVICE:
+                L2_cache_block_invalidate(paddr, paddr + size);
+                break;
+        case DMA_TO_DEVICE:
+                L2_cache_block_writeback(paddr, paddr + size);
+                break;
+        case DMA_BIDIRECTIONAL:
+                L2_cache_block_writeback_invalidate(paddr, paddr + size);
+                break;
+        default:
+                break;
+        }
+}
+
+void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr,
+                size_t size, enum dma_data_direction dir)
+{
+        return c6x_dma_sync(dev, paddr, size, dir);
+}
+
+void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,
+                size_t size, enum dma_data_direction dir)
+{
+        return c6x_dma_sync(dev, paddr, size, dir);
+}
diff --git a/arch/h8300/include/asm/pci.h b/arch/h8300/include/asm/pci.h
index 7c9e55d62215..d4d345a52092 100644
--- a/arch/h8300/include/asm/pci.h
+++ b/arch/h8300/include/asm/pci.h
@@ -15,6 +15,4 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
         /* We don't do dynamic PCI IRQ allocation */
 }
 
-#define PCI_DMA_BUS_IS_PHYS     (1)
-
 #endif /* _ASM_H8300_PCI_H */
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 76d2f20d525e..37adb2003033 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -19,6 +19,7 @@ config HEXAGON
         select GENERIC_IRQ_SHOW
         select HAVE_ARCH_KGDB
         select HAVE_ARCH_TRACEHOOK
+        select NEED_SG_DMA_LENGTH
         select NO_IOPORT_MAP
         select GENERIC_IOMAP
         select GENERIC_SMP_IDLE_THREAD
@@ -63,9 +64,6 @@ config GENERIC_CSUM
 config GENERIC_IRQ_PROBE
         def_bool y
 
-config NEED_SG_DMA_LENGTH
-        def_bool y
-
 config RWSEM_GENERIC_SPINLOCK
         def_bool n
 
diff --git a/arch/hexagon/kernel/dma.c b/arch/hexagon/kernel/dma.c
index ad8347c29dcf..77459df34e2e 100644
--- a/arch/hexagon/kernel/dma.c
+++ b/arch/hexagon/kernel/dma.c
@@ -208,7 +208,6 @@ const struct dma_map_ops hexagon_dma_ops = {
         .sync_single_for_cpu = hexagon_sync_single_for_cpu,
         .sync_single_for_device = hexagon_sync_single_for_device,
         .mapping_error  = hexagon_mapping_error,
-        .is_phys        = 1,
 };
 
 void __init hexagon_dma_init(void)
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index bbe12a038d21..2067289fad4a 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -29,7 +29,6 @@ config IA64
         select HAVE_FUNCTION_TRACER
         select TTY
         select HAVE_ARCH_TRACEHOOK
-        select HAVE_DMA_API_DEBUG
         select HAVE_MEMBLOCK
         select HAVE_MEMBLOCK_NODE_MAP
         select HAVE_VIRT_CPU_ACCOUNTING
@@ -54,6 +53,8 @@ config IA64
         select MODULES_USE_ELF_RELA
         select ARCH_USE_CMPXCHG_LOCKREF
         select HAVE_ARCH_AUDITSYSCALL
+        select NEED_DMA_MAP_STATE
+        select NEED_SG_DMA_LENGTH
         default y
         help
           The Itanium Processor Family is Intel's 64-bit successor to
@@ -78,18 +79,6 @@ config MMU
         bool
         default y
 
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool y
-
-config NEED_DMA_MAP_STATE
-        def_bool y
-
-config NEED_SG_DMA_LENGTH
-        def_bool y
-
-config SWIOTLB
-       bool
-
 config STACKTRACE_SUPPORT
         def_bool y
 
@@ -146,7 +135,6 @@ config IA64_GENERIC
         bool "generic"
         select NUMA
         select ACPI_NUMA
-        select DMA_DIRECT_OPS
         select SWIOTLB
         select PCI_MSI
         help
@@ -167,7 +155,6 @@ config IA64_GENERIC
 
 config IA64_DIG
         bool "DIG-compliant"
-        select DMA_DIRECT_OPS
         select SWIOTLB
 
 config IA64_DIG_VTD
@@ -183,7 +170,6 @@ config IA64_HP_ZX1
 
 config IA64_HP_ZX1_SWIOTLB
         bool "HP-zx1/sx1000 with software I/O TLB"
-        select DMA_DIRECT_OPS
         select SWIOTLB
         help
           Build a kernel that runs on HP zx1 and sx1000 systems even when they
@@ -207,7 +193,6 @@ config IA64_SGI_UV
         bool "SGI-UV"
         select NUMA
         select ACPI_NUMA
-        select DMA_DIRECT_OPS
         select SWIOTLB
         help
           Selecting this option will optimize the kernel for use on UV based
@@ -218,7 +203,6 @@ config IA64_SGI_UV
 
 config IA64_HP_SIM
         bool "Ski-simulator"
-        select DMA_DIRECT_OPS
         select SWIOTLB
         depends on !PM
 
@@ -613,6 +597,3 @@ source "security/Kconfig"
 source "crypto/Kconfig"
 
 source "lib/Kconfig"
-
-config IOMMU_HELPER
-        def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index cb5cd86a5530..ee5b652d320a 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -1845,9 +1845,6 @@ static void ioc_init(unsigned long hpa, struct ioc *ioc)
         ioc_resource_init(ioc);
         ioc_sac_init(ioc);
 
-        if ((long) ~iovp_mask > (long) ia64_max_iommu_merge_mask)
-                ia64_max_iommu_merge_mask = ~iovp_mask;
-
         printk(KERN_INFO PFX
                 "%s %d.%d HPA 0x%lx IOVA space %dMb at 0x%lx\n",
                 ioc->name, (ioc->rev >> 4) & 0xF, ioc->rev & 0xF,
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index b1d04e8bafc8..780e8744ba85 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -30,23 +30,6 @@ struct pci_vector_struct {
 #define PCIBIOS_MIN_IO          0x1000
 #define PCIBIOS_MIN_MEM         0x10000000
 
-/*
- * PCI_DMA_BUS_IS_PHYS should be set to 1 if there is _necessarily_ a direct
- * correspondence between device bus addresses and CPU physical addresses.
- * Platforms with a hardware I/O MMU _must_ turn this off to suppress the
- * bounce buffer handling code in the block and network device layers.
- * Platforms with separate bus address spaces _must_ turn this off and provide
- * a device DMA mapping implementation that takes care of the necessary
- * address translation.
- *
- * For now, the ia64 platforms which may have separate/multiple bus address
- * spaces all have I/O MMUs which support the merging of physically
- * discontiguous buffers, so we can use that as the sole factor to determine
- * the setting of PCI_DMA_BUS_IS_PHYS.
- */
-extern unsigned long ia64_max_iommu_merge_mask;
-#define PCI_DMA_BUS_IS_PHYS     (ia64_max_iommu_merge_mask == ~0UL)
-
 #define HAVE_PCI_MMAP
 #define ARCH_GENERIC_PCI_MMAP_RESOURCE
 #define arch_can_pci_mmap_wc()  1
diff --git a/arch/ia64/kernel/dma-mapping.c b/arch/ia64/kernel/dma-mapping.c
index f2d57e66fd86..7a471d8d67d4 100644
--- a/arch/ia64/kernel/dma-mapping.c
+++ b/arch/ia64/kernel/dma-mapping.c
@@ -9,16 +9,6 @@ int iommu_detected __read_mostly;
 const struct dma_map_ops *dma_ops;
 EXPORT_SYMBOL(dma_ops);
 
-#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
-
-static int __init dma_init(void)
-{
-        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
-
-        return 0;
-}
-fs_initcall(dma_init);
-
 const struct dma_map_ops *dma_get_ops(struct device *dev)
 {
         return dma_ops;
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index dee56bcb993d..ad43cbf70628 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -124,18 +124,6 @@ unsigned long ia64_i_cache_stride_shift = ~0;
 unsigned long ia64_cache_stride_shift = ~0;
 
 /*
- * The merge_mask variable needs to be set to (max(iommu_page_size(iommu)) - 1).  This
- * mask specifies a mask of address bits that must be 0 in order for two buffers to be
- * mergeable by the I/O MMU (i.e., the end address of the first buffer and the start
- * address of the second buffer must be aligned to (merge_mask+1) in order to be
- * mergeable).  By default, we assume there is no I/O MMU which can merge physically
- * discontiguous buffers, so we set the merge_mask to ~0UL, which corresponds to a iommu
- * page-size of 2^64.
- */
-unsigned long ia64_max_iommu_merge_mask = ~0UL;
-EXPORT_SYMBOL(ia64_max_iommu_merge_mask);
-
-/*
  * We use a special marker for the end of memory and it uses the extra (+1) slot
  */
 struct rsvd_region rsvd_region[IA64_MAX_RSVD_REGIONS + 1] __initdata;
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c
index 11f2275570fb..8479e9a7ce16 100644
--- a/arch/ia64/sn/kernel/io_common.c
+++ b/arch/ia64/sn/kernel/io_common.c
@@ -480,11 +480,6 @@ sn_io_early_init(void)
         tioca_init_provider();
         tioce_init_provider();
 
-        /*
-         * This is needed to avoid bounce limit checks in the blk layer
-         */
-        ia64_max_iommu_merge_mask = ~PAGE_MASK;
-
         sn_irq_lh_init();
         INIT_LIST_HEAD(&sn_sysdata_list);
         sn_init_cpei_timer();
diff --git a/arch/m68k/include/asm/pci.h b/arch/m68k/include/asm/pci.h
index ef26fae8cf0b..5a4bc223743b 100644
--- a/arch/m68k/include/asm/pci.h
+++ b/arch/m68k/include/asm/pci.h
@@ -4,12 +4,6 @@
 
 #include <asm-generic/pci.h>
 
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (1)
-
 #define pcibios_assign_all_busses()     1
 
 #define PCIBIOS_MIN_IO          0x00000100
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 3817a3e2146c..d14782100088 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -19,7 +19,6 @@ config MICROBLAZE
         select HAVE_ARCH_HASH
         select HAVE_ARCH_KGDB
         select HAVE_DEBUG_KMEMLEAK
-        select HAVE_DMA_API_DEBUG
         select HAVE_DYNAMIC_FTRACE
         select HAVE_FTRACE_MCOUNT_RECORD
         select HAVE_FUNCTION_GRAPH_TRACER
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index 5de871eb4a59..00337861472e 100644
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@ -62,12 +62,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus,
 
 #define HAVE_PCI_LEGACY 1
 
-/* The PCI address space does equal the physical memory
- * address space (no IOMMU).  The IDE and SCSI device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (1)
-
 extern void pcibios_claim_one_bus(struct pci_bus *b);
 
 extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c
index c91e8cef98dd..3145e7dc8ab1 100644
--- a/arch/microblaze/kernel/dma.c
+++ b/arch/microblaze/kernel/dma.c
@@ -184,14 +184,3 @@ const struct dma_map_ops dma_nommu_ops = {
         .sync_sg_for_device     = dma_nommu_sync_sg_for_device,
 };
 EXPORT_SYMBOL(dma_nommu_ops);
-
-/* Number of entries preallocated for DMA-API debugging */
-#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
-
-static int __init dma_init(void)
-{
-        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
-
-        return 0;
-}
-fs_initcall(dma_init);
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 225c95da23ce..2dcdc13cd65d 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -42,7 +42,6 @@ config MIPS
         select HAVE_C_RECORDMCOUNT
         select HAVE_DEBUG_KMEMLEAK
         select HAVE_DEBUG_STACKOVERFLOW
-        select HAVE_DMA_API_DEBUG
         select HAVE_DMA_CONTIGUOUS
         select HAVE_DYNAMIC_FTRACE
         select HAVE_EXIT_THREAD
@@ -132,7 +131,7 @@ config MIPS_GENERIC
 
 config MIPS_ALCHEMY
         bool "Alchemy processor based machines"
-        select ARCH_PHYS_ADDR_T_64BIT
+        select PHYS_ADDR_T_64BIT
         select CEVT_R4K
         select CSRC_R4K
         select IRQ_MIPS_CPU
@@ -890,7 +889,7 @@ config CAVIUM_OCTEON_SOC
         bool "Cavium Networks Octeon SoC based boards"
         select CEVT_R4K
         select ARCH_HAS_PHYS_TO_DMA
-        select ARCH_PHYS_ADDR_T_64BIT
+        select PHYS_ADDR_T_64BIT
         select DMA_COHERENT
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
@@ -912,6 +911,7 @@ config CAVIUM_OCTEON_SOC
         select MIPS_NR_CPU_NR_MAP_1024
         select BUILTIN_DTB
         select MTD_COMPLEX_MAPPINGS
+        select SWIOTLB
         select SYS_SUPPORTS_RELOCATABLE
         help
           This option supports all of the Octeon reference boards from Cavium
@@ -936,7 +936,7 @@ config NLM_XLR_BOARD
         select SWAP_IO_SPACE
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
-        select ARCH_PHYS_ADDR_T_64BIT
+        select PHYS_ADDR_T_64BIT
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_HIGHMEM
         select DMA_COHERENT
@@ -962,7 +962,7 @@ config NLM_XLP_BOARD
         select HW_HAS_PCI
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
-        select ARCH_PHYS_ADDR_T_64BIT
+        select PHYS_ADDR_T_64BIT
         select GPIOLIB
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -1101,9 +1101,6 @@ config GPIO_TXX9
 config FW_CFE
         bool
 
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool (HIGHMEM && ARCH_PHYS_ADDR_T_64BIT) || 64BIT
-
 config ARCH_SUPPORTS_UPROBES
         bool
 
@@ -1122,9 +1119,6 @@ config DMA_NONCOHERENT
         bool
         select NEED_DMA_MAP_STATE
 
-config NEED_DMA_MAP_STATE
-        bool
-
 config SYS_HAS_EARLY_PRINTK
         bool
 
@@ -1373,6 +1367,7 @@ config CPU_LOONGSON3
         select MIPS_PGD_C0_CONTEXT
         select MIPS_L1_CACHE_SHIFT_6
         select GPIOLIB
+        select SWIOTLB
         help
                 The Loongson 3 processor implements the MIPS64R2 instruction
                 set with many extensions.
@@ -1770,7 +1765,7 @@ config CPU_MIPS32_R5_XPA
         depends on SYS_SUPPORTS_HIGHMEM
         select XPA
         select HIGHMEM
-        select ARCH_PHYS_ADDR_T_64BIT
+        select PHYS_ADDR_T_64BIT
         default n
         help
           Choose this option if you want to enable the Extended Physical
@@ -2402,9 +2397,6 @@ config SB1_PASS_2_1_WORKAROUNDS
         default y
 
 
-config ARCH_PHYS_ADDR_T_64BIT
-       bool
-
 choice
         prompt "SmartMIPS or microMIPS ASE support"
 
diff --git a/arch/mips/cavium-octeon/Kconfig b/arch/mips/cavium-octeon/Kconfig
index b5eee1a57d6c..4984e462be30 100644
--- a/arch/mips/cavium-octeon/Kconfig
+++ b/arch/mips/cavium-octeon/Kconfig
@@ -67,18 +67,6 @@ config CAVIUM_OCTEON_LOCK_L2_MEMCPY
         help
           Lock the kernel's implementation of memcpy() into L2.
 
-config IOMMU_HELPER
-        bool
-
-config NEED_SG_DMA_LENGTH
-        bool
-
-config SWIOTLB
-        def_bool y
-        select DMA_DIRECT_OPS
-        select IOMMU_HELPER
-        select NEED_SG_DMA_LENGTH
-
 config OCTEON_ILM
         tristate "Module to measure interrupt latency using Octeon CIU Timer"
         help
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h
index 2339f42f047a..436099883022 100644
--- a/arch/mips/include/asm/pci.h
+++ b/arch/mips/include/asm/pci.h
@@ -121,13 +121,6 @@ extern unsigned long PCIBIOS_MIN_MEM;
 #include <linux/string.h>
 #include <asm/io.h>
 
-/*
- * The PCI address space does equal the physical memory address space.
- * The networking and block device layers use this boolean for bounce
- * buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (1)
-
 #ifdef CONFIG_PCI_DOMAINS_GENERIC
 static inline int pci_proc_domain(struct pci_bus *bus)
 {
diff --git a/arch/mips/loongson64/Kconfig b/arch/mips/loongson64/Kconfig
index 72af0c183969..c79e6a565572 100644
--- a/arch/mips/loongson64/Kconfig
+++ b/arch/mips/loongson64/Kconfig
@@ -130,21 +130,6 @@ config LOONGSON_UART_BASE
         default y
         depends on EARLY_PRINTK || SERIAL_8250
 
-config IOMMU_HELPER
-        bool
-
-config NEED_SG_DMA_LENGTH
-        bool
-
-config SWIOTLB
-        bool "Soft IOMMU Support for All-Memory DMA"
-        default y
-        depends on CPU_LOONGSON3
-        select DMA_DIRECT_OPS
-        select IOMMU_HELPER
-        select NEED_SG_DMA_LENGTH
-        select NEED_DMA_MAP_STATE
-
 config PHYS48_TO_HT40
         bool
         default y if CPU_LOONGSON3
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index dcafa43613b6..f9fef0028ca2 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -402,13 +402,3 @@ static const struct dma_map_ops mips_default_dma_map_ops = {
 
 const struct dma_map_ops *mips_dma_map_ops = &mips_default_dma_map_ops;
 EXPORT_SYMBOL(mips_dma_map_ops);
-
-#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
-
-static int __init mips_dma_init(void)
-{
-        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
-
-        return 0;
-}
-fs_initcall(mips_dma_init);
diff --git a/arch/mips/netlogic/Kconfig b/arch/mips/netlogic/Kconfig
index 7fcfc7fe9f14..412351c5acc6 100644
--- a/arch/mips/netlogic/Kconfig
+++ b/arch/mips/netlogic/Kconfig
@@ -83,10 +83,4 @@ endif
 config NLM_COMMON
         bool
 
-config IOMMU_HELPER
-        bool
-
-config NEED_SG_DMA_LENGTH
-        bool
-
 endif
diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig
index b7404f2dcf5b..6aed974276d8 100644
--- a/arch/nds32/Kconfig
+++ b/arch/nds32/Kconfig
@@ -5,10 +5,13 @@
 
 config NDS32
         def_bool y
+        select ARCH_HAS_SYNC_DMA_FOR_CPU
+        select ARCH_HAS_SYNC_DMA_FOR_DEVICE
         select ARCH_WANT_FRAME_POINTERS if FTRACE
         select CLKSRC_MMIO
         select CLONE_BACKWARDS
         select COMMON_CLK
+        select DMA_NONCOHERENT_OPS
         select GENERIC_ASHLDI3
         select GENERIC_ASHRDI3
         select GENERIC_LSHRDI3
diff --git a/arch/nds32/include/asm/Kbuild b/arch/nds32/include/asm/Kbuild
index 142e612aa639..6f5cc29ed07f 100644
--- a/arch/nds32/include/asm/Kbuild
+++ b/arch/nds32/include/asm/Kbuild
@@ -13,6 +13,7 @@ generic-y += cputime.h
 generic-y += device.h
 generic-y += div64.h
 generic-y += dma.h
+generic-y += dma-mapping.h
 generic-y += emergency-restart.h
 generic-y += errno.h
 generic-y += exec.h
diff --git a/arch/nds32/include/asm/dma-mapping.h b/arch/nds32/include/asm/dma-mapping.h
deleted file mode 100644
index 2dd47d245c25..000000000000
--- a/arch/nds32/include/asm/dma-mapping.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-// Copyright (C) 2005-2017 Andes Technology Corporation
-
-#ifndef ASMNDS32_DMA_MAPPING_H
-#define ASMNDS32_DMA_MAPPING_H
-
-extern struct dma_map_ops nds32_dma_ops;
-
-static inline struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
-{
-        return &nds32_dma_ops;
-}
-
-#endif
diff --git a/arch/nds32/kernel/dma.c b/arch/nds32/kernel/dma.c
index d291800fc621..d0dbd4fe9645 100644
--- a/arch/nds32/kernel/dma.c
+++ b/arch/nds32/kernel/dma.c
@@ -3,17 +3,14 @@
 
 #include <linux/types.h>
 #include <linux/mm.h>
-#include <linux/export.h>
 #include <linux/string.h>
-#include <linux/scatterlist.h>
-#include <linux/dma-mapping.h>
+#include <linux/dma-noncoherent.h>
 #include <linux/io.h>
 #include <linux/cache.h>
 #include <linux/highmem.h>
 #include <linux/slab.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
-#include <asm/dma-mapping.h>
 #include <asm/proc-fns.h>
 
 /*
@@ -22,11 +19,6 @@
 static pte_t *consistent_pte;
 static DEFINE_RAW_SPINLOCK(consistent_lock);
 
-enum master_type {
-        FOR_CPU = 0,
-        FOR_DEVICE = 1,
-};
-
 /*
  * VM region handling support.
  *
@@ -124,10 +116,8 @@ out:
         return c;
 }
 
-/* FIXME: attrs is not used. */
-static void *nds32_dma_alloc_coherent(struct device *dev, size_t size,
-                                      dma_addr_t * handle, gfp_t gfp,
-                                      unsigned long attrs)
+void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
+                gfp_t gfp, unsigned long attrs)
 {
         struct page *page;
         struct arch_vm_region *c;
@@ -232,8 +222,8 @@ no_page:
         return NULL;
 }
 
-static void nds32_dma_free(struct device *dev, size_t size, void *cpu_addr,
-                           dma_addr_t handle, unsigned long attrs)
+void arch_dma_free(struct device *dev, size_t size, void *cpu_addr,
+                dma_addr_t handle, unsigned long attrs)
 {
         struct arch_vm_region *c;
         unsigned long flags, addr;
@@ -333,145 +323,69 @@ static int __init consistent_init(void)
 }
 
 core_initcall(consistent_init);
-static void consistent_sync(void *vaddr, size_t size, int direction, int master_type);
-static dma_addr_t nds32_dma_map_page(struct device *dev, struct page *page,
-                                     unsigned long offset, size_t size,
-                                     enum dma_data_direction dir,
-                                     unsigned long attrs)
-{
-        if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
-                consistent_sync((void *)(page_address(page) + offset), size, dir, FOR_DEVICE);
-        return page_to_phys(page) + offset;
-}
-
-static void nds32_dma_unmap_page(struct device *dev, dma_addr_t handle,
-                                 size_t size, enum dma_data_direction dir,
-                                 unsigned long attrs)
-{
-        if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
-                consistent_sync(phys_to_virt(handle), size, dir, FOR_CPU);
-}
-
-/*
- * Make an area consistent for devices.
- */
-static void consistent_sync(void *vaddr, size_t size, int direction, int master_type)
-{
-        unsigned long start = (unsigned long)vaddr;
-        unsigned long end = start + size;
-
-        if (master_type == FOR_CPU) {
-                switch (direction) {
-                case DMA_TO_DEVICE:
-                        break;
-                case DMA_FROM_DEVICE:
-                case DMA_BIDIRECTIONAL:
-                        cpu_dma_inval_range(start, end);
-                        break;
-                default:
-                        BUG();
-                }
-        } else {
-                /* FOR_DEVICE */
-                switch (direction) {
-                case DMA_FROM_DEVICE:
-                        break;
-                case DMA_TO_DEVICE:
-                case DMA_BIDIRECTIONAL:
-                        cpu_dma_wb_range(start, end);
-                        break;
-                default:
-                        BUG();
-                }
-        }
-}
 
-static int nds32_dma_map_sg(struct device *dev, struct scatterlist *sg,
-                            int nents, enum dma_data_direction dir,
-                            unsigned long attrs)
+static inline void cache_op(phys_addr_t paddr, size_t size,
+                void (*fn)(unsigned long start, unsigned long end))
 {
-        int i;
+        struct page *page = pfn_to_page(paddr >> PAGE_SHIFT);
+        unsigned offset = paddr & ~PAGE_MASK;
+        size_t left = size;
+        unsigned long start;
 
-        for (i = 0; i < nents; i++, sg++) {
-                void *virt;
-                unsigned long pfn;
-                struct page *page = sg_page(sg);
+        do {
+                size_t len = left;
 
-                sg->dma_address = sg_phys(sg);
-                pfn = page_to_pfn(page) + sg->offset / PAGE_SIZE;
-                page = pfn_to_page(pfn);
                 if (PageHighMem(page)) {
-                        virt = kmap_atomic(page);
-                        consistent_sync(virt, sg->length, dir, FOR_CPU);
-                        kunmap_atomic(virt);
+                        void *addr;
+
+                        if (offset + len > PAGE_SIZE) {
+                                if (offset >= PAGE_SIZE) {
+                                        page += offset >> PAGE_SHIFT;
+                                        offset &= ~PAGE_MASK;
+                                }
+                                len = PAGE_SIZE - offset;
+                        }
+
+                        addr = kmap_atomic(page);
+                        start = (unsigned long)(addr + offset);
+                        fn(start, start + len);
+                        kunmap_atomic(addr);
                 } else {
-                        if (sg->offset > PAGE_SIZE)
-                                panic("sg->offset:%08x > PAGE_SIZE\n",
-                                      sg->offset);
-                        virt = page_address(page) + sg->offset;
-                        consistent_sync(virt, sg->length, dir, FOR_CPU);
+                        start = (unsigned long)phys_to_virt(paddr);
+                        fn(start, start + size);
                 }
-        }
-        return nents;
+                offset = 0;
+                page++;
+                left -= len;
+        } while (left);
 }
 
-static void nds32_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
-                               int nhwentries, enum dma_data_direction dir,
-                               unsigned long attrs)
+void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr,
+                size_t size, enum dma_data_direction dir)
 {
-}
-
-static void
-nds32_dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle,
-                              size_t size, enum dma_data_direction dir)
-{
-        consistent_sync((void *)phys_to_virt(handle), size, dir, FOR_CPU);
-}
-
-static void
-nds32_dma_sync_single_for_device(struct device *dev, dma_addr_t handle,
-                                 size_t size, enum dma_data_direction dir)
-{
-        consistent_sync((void *)phys_to_virt(handle), size, dir, FOR_DEVICE);
-}
-
-static void
-nds32_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents,
-                          enum dma_data_direction dir)
-{
-        int i;
-
-        for (i = 0; i < nents; i++, sg++) {
-                char *virt =
-                    page_address((struct page *)sg->page_link) + sg->offset;
-                consistent_sync(virt, sg->length, dir, FOR_CPU);
+        switch (dir) {
+        case DMA_FROM_DEVICE:
+                break;
+        case DMA_TO_DEVICE:
+        case DMA_BIDIRECTIONAL:
+                cache_op(paddr, size, cpu_dma_wb_range);
+                break;
+        default:
+                BUG();
         }
 }
 
-static void
-nds32_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
-                             int nents, enum dma_data_direction dir)
+void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,
+                size_t size, enum dma_data_direction dir)
 {
-        int i;
-
-        for (i = 0; i < nents; i++, sg++) {
-                char *virt =
-                    page_address((struct page *)sg->page_link) + sg->offset;
-                consistent_sync(virt, sg->length, dir, FOR_DEVICE);
+        switch (dir) {
+        case DMA_TO_DEVICE:
+                break;
+        case DMA_FROM_DEVICE:
+        case DMA_BIDIRECTIONAL:
+                cache_op(paddr, size, cpu_dma_inval_range);
+                break;
+        default:
+                BUG();
         }
 }
-
-struct dma_map_ops nds32_dma_ops = {
-        .alloc = nds32_dma_alloc_coherent,
-        .free = nds32_dma_free,
-        .map_page = nds32_dma_map_page,
-        .unmap_page = nds32_dma_unmap_page,
-        .map_sg = nds32_dma_map_sg,
-        .unmap_sg = nds32_dma_unmap_sg,
-        .sync_single_for_device = nds32_dma_sync_single_for_device,
-        .sync_single_for_cpu = nds32_dma_sync_single_for_cpu,
-        .sync_sg_for_cpu = nds32_dma_sync_sg_for_cpu,
-        .sync_sg_for_device = nds32_dma_sync_sg_for_device,
-};
-
-EXPORT_SYMBOL(nds32_dma_ops);
diff --git a/arch/openrisc/kernel/dma.c b/arch/openrisc/kernel/dma.c
index a945f00011b4..ec7fd45704d2 100644
--- a/arch/openrisc/kernel/dma.c
+++ b/arch/openrisc/kernel/dma.c
@@ -247,14 +247,3 @@ const struct dma_map_ops or1k_dma_map_ops = {
         .sync_single_for_device = or1k_sync_single_for_device,
 };
 EXPORT_SYMBOL(or1k_dma_map_ops);
-
-/* Number of entries preallocated for DMA-API debugging */
-#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
-
-static int __init dma_init(void)
-{
-        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
-
-        return 0;
-}
-fs_initcall(dma_init);
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index fc5a574c3482..4d8f64d48597 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -51,6 +51,8 @@ config PARISC
         select GENERIC_CLOCKEVENTS
         select ARCH_NO_COHERENT_DMA_MMAP
         select CPU_NO_EFFICIENT_FFS
+        select NEED_DMA_MAP_STATE
+        select NEED_SG_DMA_LENGTH
 
         help
           The PA-RISC microprocessor is designed by Hewlett-Packard and used
@@ -111,12 +113,6 @@ config PM
 config STACKTRACE_SUPPORT
         def_bool y
 
-config NEED_DMA_MAP_STATE
-        def_bool y
-
-config NEED_SG_DMA_LENGTH
-        def_bool y
-
 config ISA_DMA_API
         bool
 
diff --git a/arch/parisc/include/asm/pci.h b/arch/parisc/include/asm/pci.h
index 96b7deec512d..3328fd17c19d 100644
--- a/arch/parisc/include/asm/pci.h
+++ b/arch/parisc/include/asm/pci.h
@@ -88,29 +88,6 @@ struct pci_hba_data {
 #endif /* !CONFIG_64BIT */
 
 /*
- * If the PCI device's view of memory is the same as the CPU's view of memory,
- * PCI_DMA_BUS_IS_PHYS is true.  The networking and block device layers use
- * this boolean for bounce buffer decisions.
- */
-#ifdef CONFIG_PA20
-/* All PA-2.0 machines have an IOMMU. */
-#define PCI_DMA_BUS_IS_PHYS     0
-#define parisc_has_iommu()      do { } while (0)
-#else
-
-#if defined(CONFIG_IOMMU_CCIO) || defined(CONFIG_IOMMU_SBA)
-extern int parisc_bus_is_phys;  /* in arch/parisc/kernel/setup.c */
-#define PCI_DMA_BUS_IS_PHYS     parisc_bus_is_phys
-#define parisc_has_iommu()      do { parisc_bus_is_phys = 0; } while (0)
-#else
-#define PCI_DMA_BUS_IS_PHYS     1
-#define parisc_has_iommu()      do { } while (0)
-#endif
-
-#endif  /* !CONFIG_PA20 */
-
-
-/*
 ** Most PCI devices (eg Tulip, NCR720) also export the same registers
 ** to both MMIO and I/O port space.  Due to poor performance of I/O Port
 ** access under HP PCI bus adapters, strongly recommend the use of MMIO
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 0e9675f857a5..8d3a7b80ac42 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -58,11 +58,6 @@ struct proc_dir_entry * proc_runway_root __read_mostly = NULL;
 struct proc_dir_entry * proc_gsc_root __read_mostly = NULL;
 struct proc_dir_entry * proc_mckinley_root __read_mostly = NULL;
 
-#if !defined(CONFIG_PA20) && (defined(CONFIG_IOMMU_CCIO) || defined(CONFIG_IOMMU_SBA))
-int parisc_bus_is_phys __read_mostly = 1;       /* Assume no IOMMU is present */
-EXPORT_SYMBOL(parisc_bus_is_phys);
-#endif
-
 void __init setup_cmdline(char **cmdline_p)
 {
         extern unsigned int boot_args[];
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c32a181a7cbb..268fd46fc3c7 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -13,12 +13,6 @@ config 64BIT
         bool
         default y if PPC64
 
-config ARCH_PHYS_ADDR_T_64BIT
-       def_bool PPC64 || PHYS_64BIT
-
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool ARCH_PHYS_ADDR_T_64BIT
-
 config MMU
         bool
         default y
@@ -187,7 +181,6 @@ config PPC
         select HAVE_CONTEXT_TRACKING            if PPC64
         select HAVE_DEBUG_KMEMLEAK
         select HAVE_DEBUG_STACKOVERFLOW
-        select HAVE_DMA_API_DEBUG
         select HAVE_DYNAMIC_FTRACE
         select HAVE_DYNAMIC_FTRACE_WITH_REGS    if MPROFILE_KERNEL
         select HAVE_EBPF_JIT                    if PPC64
@@ -223,9 +216,11 @@ config PPC
         select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_VIRT_CPU_ACCOUNTING
         select HAVE_IRQ_TIME_ACCOUNTING
+        select IOMMU_HELPER                     if PPC64
         select IRQ_DOMAIN
         select IRQ_FORCED_THREADING
         select MODULES_USE_ELF_RELA
+        select NEED_SG_DMA_LENGTH
         select NO_BOOTMEM
         select OF
         select OF_EARLY_FLATTREE
@@ -478,19 +473,6 @@ config MPROFILE_KERNEL
         depends on PPC64 && CPU_LITTLE_ENDIAN
         def_bool !DISABLE_MPROFILE_KERNEL
 
-config IOMMU_HELPER
-        def_bool PPC64
-
-config SWIOTLB
-        bool "SWIOTLB support"
-        default n
-        select IOMMU_HELPER
-        ---help---
-          Support for IO bounce buffering for systems without an IOMMU.
-          This allows us to DMA to the full physical address space on
-          platforms where the size of a physical address is larger
-          than the bus address.  Not all platforms support this.
-
 config HOTPLUG_CPU
         bool "Support for enabling/disabling CPUs"
         depends on SMP && (PPC_PSERIES || \
@@ -913,9 +895,6 @@ config ZONE_DMA
 config NEED_DMA_MAP_STATE
         def_bool (PPC64 || NOT_COHERENT_CACHE)
 
-config NEED_SG_DMA_LENGTH
-        def_bool y
-
 config GENERIC_ISA_DMA
         bool
         depends on ISA_DMA_API
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
index 401c62aad5e4..2af9ded80540 100644
--- a/arch/powerpc/include/asm/pci.h
+++ b/arch/powerpc/include/asm/pci.h
@@ -92,24 +92,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus,
 
 #define HAVE_PCI_LEGACY 1
 
-#ifdef CONFIG_PPC64
-
-/* The PCI address space does not equal the physical memory address
- * space (we have an IOMMU).  The IDE and SCSI device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (0)
-
-#else /* 32-bit */
-
-/* The PCI address space does equal the physical memory
- * address space (no IOMMU).  The IDE and SCSI device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (1)
-
-#endif /* CONFIG_PPC64 */
-
 extern void pcibios_claim_one_bus(struct pci_bus *b);
 
 extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
index da20569de9d4..138157deeadf 100644
--- a/arch/powerpc/kernel/dma.c
+++ b/arch/powerpc/kernel/dma.c
@@ -309,8 +309,6 @@ int dma_set_coherent_mask(struct device *dev, u64 mask)
 }
 EXPORT_SYMBOL(dma_set_coherent_mask);
 
-#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
-
 int dma_set_mask(struct device *dev, u64 dma_mask)
 {
         if (ppc_md.dma_set_mask)
@@ -361,7 +359,6 @@ EXPORT_SYMBOL_GPL(dma_get_required_mask);
 
 static int __init dma_init(void)
 {
-        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
 #ifdef CONFIG_PCI
         dma_debug_add_bus(&pci_bus_type);
 #endif
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 67d3125d0610..84b58abc08ee 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -222,6 +222,7 @@ config PTE_64BIT
 config PHYS_64BIT
         bool 'Large physical address support' if E500 || PPC_86xx
         depends on (44x || E500 || PPC_86xx) && !PPC_83xx && !PPC_82xx
+        select PHYS_ADDR_T_64BIT
         ---help---
           This option enables kernel support for larger than 32-bit physical
           addresses.  This feature may not be available on all cores.
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index cd4fd85fde84..274bc064c41f 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -3,8 +3,16 @@
 # see Documentation/kbuild/kconfig-language.txt.
 #
 
+config 64BIT
+        bool
+
+config 32BIT
+        bool
+
 config RISCV
         def_bool y
+        # even on 32-bit, physical (and DMA) addresses are > 32-bits
+        select PHYS_ADDR_T_64BIT
         select OF
         select OF_EARLY_FLATTREE
         select OF_IRQ
@@ -22,7 +30,6 @@ config RISCV
         select GENERIC_ATOMIC64 if !64BIT || !RISCV_ISA_A
         select HAVE_MEMBLOCK
         select HAVE_MEMBLOCK_NODE_MAP
-        select HAVE_DMA_API_DEBUG
         select HAVE_DMA_CONTIGUOUS
         select HAVE_GENERIC_DMA_COHERENT
         select IRQ_DOMAIN
@@ -39,16 +46,9 @@ config RISCV
 config MMU
         def_bool y
 
-# even on 32-bit, physical (and DMA) addresses are > 32-bits
-config ARCH_PHYS_ADDR_T_64BIT
-        def_bool y
-
 config ZONE_DMA32
         bool
-        default y
-
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool y
+        default y if 64BIT
 
 config PAGE_OFFSET
         hex
@@ -101,7 +101,6 @@ choice
 
 config ARCH_RV32I
         bool "RV32I"
-        select CPU_SUPPORTS_32BIT_KERNEL
         select 32BIT
         select GENERIC_ASHLDI3
         select GENERIC_ASHRDI3
@@ -109,13 +108,13 @@ config ARCH_RV32I
 
 config ARCH_RV64I
         bool "RV64I"
-        select CPU_SUPPORTS_64BIT_KERNEL
         select 64BIT
         select HAVE_FUNCTION_TRACER
         select HAVE_FUNCTION_GRAPH_TRACER
         select HAVE_FTRACE_MCOUNT_RECORD
         select HAVE_DYNAMIC_FTRACE
         select HAVE_DYNAMIC_FTRACE_WITH_REGS
+        select SWIOTLB
 
 endchoice
 
@@ -171,11 +170,6 @@ config NR_CPUS
         depends on SMP
         default "8"
 
-config CPU_SUPPORTS_32BIT_KERNEL
-        bool
-config CPU_SUPPORTS_64BIT_KERNEL
-        bool
-
 choice
         prompt "CPU Tuning"
         default TUNE_GENERIC
@@ -202,24 +196,6 @@ endmenu
 
 menu "Kernel type"
 
-choice
-        prompt "Kernel code model"
-        default 64BIT
-
-config 32BIT
-        bool "32-bit kernel"
-        depends on CPU_SUPPORTS_32BIT_KERNEL
-        help
-          Select this option to build a 32-bit kernel.
-
-config 64BIT
-        bool "64-bit kernel"
-        depends on CPU_SUPPORTS_64BIT_KERNEL
-        help
-          Select this option to build a 64-bit kernel.
-
-endchoice
-
 source "mm/Kconfig"
 
 source "kernel/Kconfig.preempt"
diff --git a/arch/riscv/include/asm/dma-mapping.h b/arch/riscv/include/asm/dma-mapping.h
new file mode 100644
index 000000000000..8facc1c8fa05
--- /dev/null
+++ b/arch/riscv/include/asm/dma-mapping.h
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
+#ifndef _RISCV_ASM_DMA_MAPPING_H
+#define _RISCV_ASM_DMA_MAPPING_H 1
+
+#ifdef CONFIG_SWIOTLB
+#include <linux/swiotlb.h>
+static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
+{
+        return &swiotlb_dma_ops;
+}
+#else
+#include <asm-generic/dma-mapping.h>
+#endif /* CONFIG_SWIOTLB */
+
+#endif /* _RISCV_ASM_DMA_MAPPING_H */
diff --git a/arch/riscv/include/asm/pci.h b/arch/riscv/include/asm/pci.h
index 0f2fc9ef20fc..b3638c505728 100644
--- a/arch/riscv/include/asm/pci.h
+++ b/arch/riscv/include/asm/pci.h
@@ -26,9 +26,6 @@
 /* RISC-V shim does not initialize PCI bus */
 #define pcibios_assign_all_busses() 1
 
-/* We do not have an IOMMU */
-#define PCI_DMA_BUS_IS_PHYS 1
-
 extern int isa_dma_bridge_buggy;
 
 #ifdef CONFIG_PCI
diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index c11f40c1b2a8..ee44a48faf79 100644
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -29,6 +29,7 @@
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 #include <linux/sched/task.h>
+#include <linux/swiotlb.h>
 
 #include <asm/setup.h>
 #include <asm/sections.h>
@@ -206,6 +207,7 @@ void __init setup_arch(char **cmdline_p)
         setup_bootmem();
         paging_init();
         unflatten_device_tree();
+        swiotlb_init(1);
 
 #ifdef CONFIG_SMP
         setup_smp();
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 199ac3e4da1d..6a64287ec1da 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -35,9 +35,6 @@ config GENERIC_BUG
 config GENERIC_BUG_RELATIVE_POINTERS
         def_bool y
 
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool y
-
 config GENERIC_LOCKBREAK
         def_bool y if SMP && PREEMPT
 
@@ -133,7 +130,6 @@ config S390
         select HAVE_CMPXCHG_LOCAL
         select HAVE_COPY_THREAD_TLS
         select HAVE_DEBUG_KMEMLEAK
-        select HAVE_DMA_API_DEBUG
         select HAVE_DMA_CONTIGUOUS
         select DMA_DIRECT_OPS
         select HAVE_DYNAMIC_FTRACE
@@ -709,7 +705,11 @@ config QDIO
 menuconfig PCI
         bool "PCI support"
         select PCI_MSI
+        select IOMMU_HELPER
         select IOMMU_SUPPORT
+        select NEED_DMA_MAP_STATE
+        select NEED_SG_DMA_LENGTH
+
         help
           Enable PCI support.
 
@@ -733,15 +733,6 @@ config PCI_DOMAINS
 config HAS_IOMEM
         def_bool PCI
 
-config IOMMU_HELPER
-        def_bool PCI
-
-config NEED_SG_DMA_LENGTH
-        def_bool PCI
-
-config NEED_DMA_MAP_STATE
-        def_bool PCI
-
 config CHSC_SCH
         def_tristate m
         prompt "Support for CHSC subchannels"
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index 12fe3591034f..94f8db468c9b 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -2,8 +2,6 @@
 #ifndef __ASM_S390_PCI_H
 #define __ASM_S390_PCI_H
 
-/* must be set before including asm-generic/pci.h */
-#define PCI_DMA_BUS_IS_PHYS (0)
 /* must be set before including pci_clp.h */
 #define PCI_BAR_COUNT   6
 
diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c
index 2d15d84c20ed..d387a0fbdd7e 100644
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@ -668,15 +668,6 @@ void zpci_dma_exit(void)
         kmem_cache_destroy(dma_region_table_cache);
 }
 
-#define PREALLOC_DMA_DEBUG_ENTRIES      (1 << 16)
-
-static int __init dma_debug_do_init(void)
-{
-        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
-        return 0;
-}
-fs_initcall(dma_debug_do_init);
-
 const struct dma_map_ops s390_pci_dma_ops = {
         .alloc          = s390_dma_alloc,
         .free           = s390_dma_free,
@@ -685,8 +676,6 @@ const struct dma_map_ops s390_pci_dma_ops = {
         .map_page       = s390_dma_map_pages,
         .unmap_page     = s390_dma_unmap_pages,
         .mapping_error  = s390_mapping_error,
-        /* if we support direct DMA this must be conditional */
-        .is_phys        = 0,
         /* dma_supported is unconditionally true without a callback */
 };
 EXPORT_SYMBOL_GPL(s390_pci_dma_ops);
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 1851eaeee131..a97538b607a4 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -14,7 +14,6 @@ config SUPERH
         select HAVE_OPROFILE
         select HAVE_GENERIC_DMA_COHERENT
         select HAVE_ARCH_TRACEHOOK
-        select HAVE_DMA_API_DEBUG
         select HAVE_PERF_EVENTS
         select HAVE_DEBUG_BUGVERBOSE
         select ARCH_HAVE_CUSTOM_GPIO_H
@@ -51,6 +50,9 @@ config SUPERH
         select HAVE_ARCH_AUDITSYSCALL
         select HAVE_FUTEX_CMPXCHG if FUTEX
         select HAVE_NMI
+        select NEED_DMA_MAP_STATE
+        select NEED_SG_DMA_LENGTH
+
         help
           The SuperH is a RISC processor targeted for use in embedded systems
           and consumer electronics; it was also used in the Sega Dreamcast
@@ -161,12 +163,6 @@ config DMA_COHERENT
 config DMA_NONCOHERENT
         def_bool !DMA_COHERENT
 
-config NEED_DMA_MAP_STATE
-        def_bool DMA_NONCOHERENT
-
-config NEED_SG_DMA_LENGTH
-        def_bool y
-
 config PGTABLE_LEVELS
         default 3 if X2TLB
         default 2
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h
index 0033f0df2b3b..10a36b1cf2ea 100644
--- a/arch/sh/include/asm/pci.h
+++ b/arch/sh/include/asm/pci.h
@@ -71,12 +71,6 @@ extern unsigned long PCIBIOS_MIN_IO, PCIBIOS_MIN_MEM;
  * SuperH has everything mapped statically like x86.
  */
 
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (dma_ops->is_phys)
-
 #ifdef CONFIG_PCI
 /*
  * None of the SH PCI controllers support MWI, it is always treated as a
diff --git a/arch/sh/kernel/dma-nommu.c b/arch/sh/kernel/dma-nommu.c
index 178457d7620c..3e3a32fc676e 100644
--- a/arch/sh/kernel/dma-nommu.c
+++ b/arch/sh/kernel/dma-nommu.c
@@ -78,7 +78,6 @@ const struct dma_map_ops nommu_dma_ops = {
         .sync_single_for_device = nommu_sync_single_for_device,
         .sync_sg_for_device     = nommu_sync_sg_for_device,
 #endif
-        .is_phys                = 1,
 };
 
 void __init no_iommu_init(void)
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index f1b44697ad68..fceb2adfcac7 100644
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -20,18 +20,9 @@
 #include <asm/cacheflush.h>
 #include <asm/addrspace.h>
 
-#define PREALLOC_DMA_DEBUG_ENTRIES      4096
-
 const struct dma_map_ops *dma_ops;
 EXPORT_SYMBOL(dma_ops);
 
-static int __init dma_init(void)
-{
-        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
-        return 0;
-}
-fs_initcall(dma_init);
-
 void *dma_generic_alloc_coherent(struct device *dev, size_t size,
                                  dma_addr_t *dma_handle, gfp_t gfp,
                                  unsigned long attrs)
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 8767e45f1b2b..435dbc033afe 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -25,7 +25,6 @@ config SPARC
         select RTC_CLASS
         select RTC_DRV_M48T59
         select RTC_SYSTOHC
-        select HAVE_DMA_API_DEBUG
         select HAVE_ARCH_JUMP_LABEL if SPARC64
         select GENERIC_IRQ_SHOW
         select ARCH_WANT_IPC_PARSE_VERSION
@@ -44,6 +43,8 @@ config SPARC
         select ARCH_HAS_SG_CHAIN
         select CPU_NO_EFFICIENT_FFS
         select LOCKDEP_SMALL if LOCKDEP
+        select NEED_DMA_MAP_STATE
+        select NEED_SG_DMA_LENGTH
 
 config SPARC32
         def_bool !64BIT
@@ -67,6 +68,7 @@ config SPARC64
         select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_CONTEXT_TRACKING
         select HAVE_DEBUG_KMEMLEAK
+        select IOMMU_HELPER
         select SPARSE_IRQ
         select RTC_DRV_CMOS
         select RTC_DRV_BQ4802
@@ -102,14 +104,6 @@ config ARCH_ATU
         bool
         default y if SPARC64
 
-config ARCH_DMA_ADDR_T_64BIT
-        bool
-        default y if ARCH_ATU
-
-config IOMMU_HELPER
-        bool
-        default y if SPARC64
-
 config STACKTRACE_SUPPORT
         bool
         default y if SPARC64
@@ -146,12 +140,6 @@ config ZONE_DMA
         bool
         default y if SPARC32
 
-config NEED_DMA_MAP_STATE
-        def_bool y
-
-config NEED_SG_DMA_LENGTH
-        def_bool y
-
 config GENERIC_ISA_DMA
         bool
         default y if SPARC32
diff --git a/include/linux/iommu-common.h b/arch/sparc/include/asm/iommu-common.h
index 802c90c79d1f..802c90c79d1f 100644
--- a/include/linux/iommu-common.h
+++ b/arch/sparc/include/asm/iommu-common.h
diff --git a/arch/sparc/include/asm/iommu_64.h b/arch/sparc/include/asm/iommu_64.h
index 9ed6b54caa4b..0ef6dedf747e 100644
--- a/arch/sparc/include/asm/iommu_64.h
+++ b/arch/sparc/include/asm/iommu_64.h
@@ -17,7 +17,7 @@
 #define IOPTE_WRITE   0x0000000000000002UL
 
 #define IOMMU_NUM_CTXS  4096
-#include <linux/iommu-common.h>
+#include <asm/iommu-common.h>
 
 struct iommu_arena {
         unsigned long   *map;
diff --git a/arch/sparc/include/asm/pci_32.h b/arch/sparc/include/asm/pci_32.h
index 98917e48727d..cfc0ee9476c6 100644
--- a/arch/sparc/include/asm/pci_32.h
+++ b/arch/sparc/include/asm/pci_32.h
@@ -17,10 +17,6 @@
 
 #define PCI_IRQ_NONE            0xffffffff
 
-/* Dynamic DMA mapping stuff.
- */
-#define PCI_DMA_BUS_IS_PHYS     (0)
-
 #endif /* __KERNEL__ */
 
 #ifndef CONFIG_LEON_PCI
diff --git a/arch/sparc/include/asm/pci_64.h b/arch/sparc/include/asm/pci_64.h
index 671274e36cfa..fac77813402c 100644
--- a/arch/sparc/include/asm/pci_64.h
+++ b/arch/sparc/include/asm/pci_64.h
@@ -17,12 +17,6 @@
 
 #define PCI_IRQ_NONE            0xffffffff
 
-/* The PCI address space does not equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (0)
-
 /* PCI IOMMU mapping bypass support. */
 
 /* PCI 64-bit addressing works for all slots on all controller
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
index 76cb57750dda..cf8640841b7a 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
@@ -59,7 +59,7 @@ obj-$(CONFIG_SPARC32)   += leon_pmc.o
 
 obj-$(CONFIG_SPARC64)   += reboot.o
 obj-$(CONFIG_SPARC64)   += sysfs.o
-obj-$(CONFIG_SPARC64)   += iommu.o
+obj-$(CONFIG_SPARC64)   += iommu.o iommu-common.o
 obj-$(CONFIG_SPARC64)   += central.o
 obj-$(CONFIG_SPARC64)   += starfire.o
 obj-$(CONFIG_SPARC64)   += power.o
@@ -74,8 +74,6 @@ obj-$(CONFIG_SPARC64)	+= pcr.o
 obj-$(CONFIG_SPARC64)   += nmi.o
 obj-$(CONFIG_SPARC64_SMP) += cpumap.o
 
-obj-y                     += dma.o
-
 obj-$(CONFIG_PCIC_PCI)    += pcic.o
 obj-$(CONFIG_LEON_PCI)    += leon_pci.o
 obj-$(CONFIG_SPARC_GRPCI2)+= leon_pci_grpci2.o
diff --git a/arch/sparc/kernel/dma.c b/arch/sparc/kernel/dma.c
deleted file mode 100644
index f73e7597c971..000000000000
--- a/arch/sparc/kernel/dma.c
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <linux/kernel.h>
-#include <linux/dma-mapping.h>
-#include <linux/dma-debug.h>
-
-#define PREALLOC_DMA_DEBUG_ENTRIES       (1 << 15)
-
-static int __init dma_init(void)
-{
-        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
-        return 0;
-}
-fs_initcall(dma_init);
diff --git a/lib/iommu-common.c b/arch/sparc/kernel/iommu-common.c
index 55b00de106b5..59cb16691322 100644
--- a/lib/iommu-common.c
+++ b/arch/sparc/kernel/iommu-common.c
@@ -8,9 +8,9 @@
 #include <linux/bitmap.h>
 #include <linux/bug.h>
 #include <linux/iommu-helper.h>
-#include <linux/iommu-common.h>
 #include <linux/dma-mapping.h>
 #include <linux/hash.h>
+#include <asm/iommu-common.h>
 
 static unsigned long iommu_large_alloc = 15;
 
@@ -93,7 +93,6 @@ void iommu_tbl_pool_init(struct iommu_map_table *iommu,
         p->hint = p->start;
         p->end = num_entries;
 }
-EXPORT_SYMBOL(iommu_tbl_pool_init);
 
 unsigned long iommu_tbl_range_alloc(struct device *dev,
                                 struct iommu_map_table *iommu,
@@ -224,7 +223,6 @@ bail:
 
         return n;
 }
-EXPORT_SYMBOL(iommu_tbl_range_alloc);
 
 static struct iommu_pool *get_pool(struct iommu_map_table *tbl,
                                    unsigned long entry)
@@ -264,4 +262,3 @@ void iommu_tbl_range_free(struct iommu_map_table *iommu, u64 dma_addr,
         bitmap_clear(iommu->map, entry, npages);
         spin_unlock_irqrestore(&(pool->lock), flags);
 }
-EXPORT_SYMBOL(iommu_tbl_range_free);
diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
index b08dc3416f06..40d008b0bd3e 100644
--- a/arch/sparc/kernel/iommu.c
+++ b/arch/sparc/kernel/iommu.c
@@ -14,7 +14,7 @@
 #include <linux/errno.h>
 #include <linux/iommu-helper.h>
 #include <linux/bitmap.h>
-#include <linux/iommu-common.h>
+#include <asm/iommu-common.h>
 
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
index 86b625f9d8dc..c0fa3ef6cf01 100644
--- a/arch/sparc/kernel/ldc.c
+++ b/arch/sparc/kernel/ldc.c
@@ -16,7 +16,7 @@
 #include <linux/list.h>
 #include <linux/init.h>
 #include <linux/bitmap.h>
-#include <linux/iommu-common.h>
+#include <asm/iommu-common.h>
 
 #include <asm/hypervisor.h>
 #include <asm/iommu.h>
diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
index 249367228c33..565d9ac883d0 100644
--- a/arch/sparc/kernel/pci_sun4v.c
+++ b/arch/sparc/kernel/pci_sun4v.c
@@ -16,7 +16,7 @@
 #include <linux/export.h>
 #include <linux/log2.h>
 #include <linux/of_device.h>
-#include <linux/iommu-common.h>
+#include <asm/iommu-common.h>
 
 #include <asm/iommu.h>
 #include <asm/irq.h>
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 462e59a7ae78..03f991e44288 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -19,6 +19,8 @@ config UNICORE32
         select ARCH_WANT_FRAME_POINTERS
         select GENERIC_IOMAP
         select MODULES_USE_ELF_REL
+        select NEED_DMA_MAP_STATE
+        select SWIOTLB
         help
           UniCore-32 is 32-bit Instruction Set Architecture,
           including a series of low-power-consumption RISC chip
@@ -61,9 +63,6 @@ config ARCH_MAY_HAVE_PC_FDC
 config ZONE_DMA
         def_bool y
 
-config NEED_DMA_MAP_STATE
-       def_bool y
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
diff --git a/arch/unicore32/mm/Kconfig b/arch/unicore32/mm/Kconfig
index e9154a59d561..82759b6aba67 100644
--- a/arch/unicore32/mm/Kconfig
+++ b/arch/unicore32/mm/Kconfig
@@ -39,14 +39,3 @@ config CPU_TLB_SINGLE_ENTRY_DISABLE
         default y
         help
           Say Y here to disable the TLB single entry operations.
-
-config SWIOTLB
-        def_bool y
-        select DMA_DIRECT_OPS
-
-config IOMMU_HELPER
-        def_bool SWIOTLB
-
-config NEED_SG_DMA_LENGTH
-        def_bool SWIOTLB
-
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c07f492b871a..f2ee6a8ffe65 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -28,6 +28,8 @@ config X86_64
         select ARCH_USE_CMPXCHG_LOCKREF
         select HAVE_ARCH_SOFT_DIRTY
         select MODULES_USE_ELF_RELA
+        select NEED_DMA_MAP_STATE
+        select SWIOTLB
         select X86_DEV_DMA_OPS
         select ARCH_HAS_SYSCALL_WRAPPER
 
@@ -134,7 +136,6 @@ config X86
         select HAVE_C_RECORDMCOUNT
         select HAVE_DEBUG_KMEMLEAK
         select HAVE_DEBUG_STACKOVERFLOW
-        select HAVE_DMA_API_DEBUG
         select HAVE_DMA_CONTIGUOUS
         select HAVE_DYNAMIC_FTRACE
         select HAVE_DYNAMIC_FTRACE_WITH_REGS
@@ -184,6 +185,7 @@ config X86
         select HAVE_UNSTABLE_SCHED_CLOCK
         select HAVE_USER_RETURN_NOTIFIER
         select IRQ_FORCED_THREADING
+        select NEED_SG_DMA_LENGTH
         select PCI_LOCKLESS_CONFIG
         select PERF_EVENTS
         select RTC_LIB
@@ -236,13 +238,6 @@ config ARCH_MMAP_RND_COMPAT_BITS_MAX
 config SBUS
         bool
 
-config NEED_DMA_MAP_STATE
-        def_bool y
-        depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG || SWIOTLB
-
-config NEED_SG_DMA_LENGTH
-        def_bool y
-
 config GENERIC_ISA_DMA
         def_bool y
         depends on ISA_DMA_API
@@ -875,6 +870,7 @@ config DMI
 
 config GART_IOMMU
         bool "Old AMD GART IOMMU support"
+        select IOMMU_HELPER
         select SWIOTLB
         depends on X86_64 && PCI && AMD_NB
         ---help---
@@ -896,6 +892,7 @@ config GART_IOMMU
 
 config CALGARY_IOMMU
         bool "IBM Calgary IOMMU support"
+        select IOMMU_HELPER
         select SWIOTLB
         depends on X86_64 && PCI
         ---help---
@@ -923,20 +920,6 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
           Calgary anyway, pass 'iommu=calgary' on the kernel command line.
           If unsure, say Y.
 
-# need this always selected by IOMMU for the VIA workaround
-config SWIOTLB
-        def_bool y if X86_64
-        ---help---
-          Support for software bounce buffers used on x86-64 systems
-          which don't have a hardware IOMMU. Using this PCI devices
-          which can only access 32-bits of memory can be used on systems
-          with more than 3 GB of memory.
-          If unsure, say Y.
-
-config IOMMU_HELPER
-        def_bool y
-        depends on CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU
-
 config MAXSMP
         bool "Enable Maximum number of SMP Processors and NUMA Nodes"
         depends on X86_64 && SMP && DEBUG_KERNEL
@@ -1458,6 +1441,7 @@ config HIGHMEM
 config X86_PAE
         bool "PAE (Physical Address Extension) Support"
         depends on X86_32 && !HIGHMEM4G
+        select PHYS_ADDR_T_64BIT
         select SWIOTLB
         ---help---
           PAE is required for NX support, and furthermore enables
@@ -1485,14 +1469,6 @@ config X86_5LEVEL
 
           Say N if unsure.
 
-config ARCH_PHYS_ADDR_T_64BIT
-        def_bool y
-        depends on X86_64 || X86_PAE
-
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool y
-        depends on X86_64 || HIGHMEM64G
-
 config X86_DIRECT_GBPAGES
         def_bool y
         depends on X86_64 && !DEBUG_PAGEALLOC
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
index 89ce4bfd241f..ce4d176b3d13 100644
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@ -30,10 +30,7 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
         return dma_ops;
 }
 
-int arch_dma_supported(struct device *dev, u64 mask);
-#define arch_dma_supported arch_dma_supported
-
-bool arch_dma_alloc_attrs(struct device **dev, gfp_t *gfp);
+bool arch_dma_alloc_attrs(struct device **dev);
 #define arch_dma_alloc_attrs arch_dma_alloc_attrs
 
 #endif
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index d32175e30259..662963681ea6 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -117,9 +117,6 @@ void native_restore_msi_irqs(struct pci_dev *dev);
 #define native_setup_msi_irqs           NULL
 #define native_teardown_msi_irq         NULL
 #endif
-
-#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
-
 #endif  /* __KERNEL__ */
 
 #ifdef CONFIG_X86_64
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 77625b60a510..ab5d9dd668d2 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -15,13 +15,11 @@
 #include <asm/x86_init.h>
 #include <asm/iommu_table.h>
 
-static int forbid_dac __read_mostly;
+static bool disable_dac_quirk __read_mostly;
 
 const struct dma_map_ops *dma_ops = &dma_direct_ops;
 EXPORT_SYMBOL(dma_ops);
 
-static int iommu_sac_force __read_mostly;
-
 #ifdef CONFIG_IOMMU_DEBUG
 int panic_on_overflow __read_mostly = 1;
 int force_iommu __read_mostly = 1;
@@ -55,9 +53,6 @@ struct device x86_dma_fallback_dev = {
 };
 EXPORT_SYMBOL(x86_dma_fallback_dev);
 
-/* Number of entries preallocated for DMA-API debugging */
-#define PREALLOC_DMA_DEBUG_ENTRIES       65536
-
 void __init pci_iommu_alloc(void)
 {
         struct iommu_table_entry *p;
@@ -76,7 +71,7 @@ void __init pci_iommu_alloc(void)
         }
 }
 
-bool arch_dma_alloc_attrs(struct device **dev, gfp_t *gfp)
+bool arch_dma_alloc_attrs(struct device **dev)
 {
         if (!*dev)
                 *dev = &x86_dma_fallback_dev;
@@ -125,13 +120,13 @@ static __init int iommu_setup(char *p)
                 if (!strncmp(p, "nomerge", 7))
                         iommu_merge = 0;
                 if (!strncmp(p, "forcesac", 8))
-                        iommu_sac_force = 1;
+                        pr_warn("forcesac option ignored.\n");
                 if (!strncmp(p, "allowdac", 8))
-                        forbid_dac = 0;
+                        pr_warn("allowdac option ignored.\n");
                 if (!strncmp(p, "nodac", 5))
-                        forbid_dac = 1;
+                        pr_warn("nodac option ignored.\n");
                 if (!strncmp(p, "usedac", 6)) {
-                        forbid_dac = -1;
+                        disable_dac_quirk = true;
                         return 1;
                 }
 #ifdef CONFIG_SWIOTLB
@@ -156,40 +151,9 @@ static __init int iommu_setup(char *p)
 }
 early_param("iommu", iommu_setup);
 
-int arch_dma_supported(struct device *dev, u64 mask)
-{
-#ifdef CONFIG_PCI
-        if (mask > 0xffffffff && forbid_dac > 0) {
-                dev_info(dev, "PCI: Disallowing DAC for device\n");
-                return 0;
-        }
-#endif
-
-        /* Tell the device to use SAC when IOMMU force is on.  This
-           allows the driver to use cheaper accesses in some cases.
-
-           Problem with this is that if we overflow the IOMMU area and
-           return DAC as fallback address the device may not handle it
-           correctly.
-
-           As a special case some controllers have a 39bit address
-           mode that is as efficient as 32bit (aic79xx). Don't force
-           SAC for these.  Assume all masks <= 40 bits are of this
-           type. Normally this doesn't make any difference, but gives
-           more gentle handling of IOMMU overflow. */
-        if (iommu_sac_force && (mask >= DMA_BIT_MASK(40))) {
-                dev_info(dev, "Force SAC with mask %Lx\n", mask);
-                return 0;
-        }
-
-        return 1;
-}
-EXPORT_SYMBOL(arch_dma_supported);
-
 static int __init pci_iommu_init(void)
 {
         struct iommu_table_entry *p;
-        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
 
 #ifdef CONFIG_PCI
         dma_debug_add_bus(&pci_bus_type);
@@ -209,11 +173,17 @@ rootfs_initcall(pci_iommu_init);
 #ifdef CONFIG_PCI
 /* Many VIA bridges seem to corrupt data for DAC. Disable it here */
 
+static int via_no_dac_cb(struct pci_dev *pdev, void *data)
+{
+        pdev->dev.dma_32bit_limit = true;
+        return 0;
+}
+
 static void via_no_dac(struct pci_dev *dev)
 {
-        if (forbid_dac == 0) {
+        if (!disable_dac_quirk) {
                 dev_info(&dev->dev, "disabling DAC on VIA PCI bridge\n");
-                forbid_dac = 1;
+                pci_walk_bus(dev->subordinate, via_no_dac_cb, NULL);
         }
 }
 DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_VIA, PCI_ANY_ID,
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index c921e8bccdc8..17df332269b2 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -19,7 +19,6 @@ config XTENSA
         select HAVE_ARCH_KASAN if MMU
         select HAVE_CC_STACKPROTECTOR
         select HAVE_DEBUG_KMEMLEAK
-        select HAVE_DMA_API_DEBUG
         select HAVE_DMA_CONTIGUOUS
         select HAVE_EXIT_THREAD
         select HAVE_FUNCTION_TRACER
diff --git a/arch/xtensa/include/asm/pci.h b/arch/xtensa/include/asm/pci.h
index d5a82153a7c5..6ddf0a30c60d 100644
--- a/arch/xtensa/include/asm/pci.h
+++ b/arch/xtensa/include/asm/pci.h
@@ -42,8 +42,6 @@ extern struct pci_controller* pcibios_alloc_controller(void);
  * decisions.
  */
 
-#define PCI_DMA_BUS_IS_PHYS     (1)
-
 /* Tell PCI code what kind of PCI resource mappings we support */
 #define HAVE_PCI_MMAP                   1
 #define ARCH_GENERIC_PCI_MMAP_RESOURCE  1
diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c
index 732631ce250f..392b4a80ebc2 100644
--- a/arch/xtensa/kernel/pci-dma.c
+++ b/arch/xtensa/kernel/pci-dma.c
@@ -261,12 +261,3 @@ const struct dma_map_ops xtensa_dma_map_ops = {
         .mapping_error = xtensa_dma_mapping_error,
 };
 EXPORT_SYMBOL(xtensa_dma_map_ops);
-
-#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
-
-static int __init xtensa_dma_init(void)
-{
-        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
-        return 0;
-}
-fs_initcall(xtensa_dma_init);
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 4a3ac31c07d0..3b0118786b43 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -20,6 +20,7 @@
 #include <linux/sizes.h>
 #include <linux/limits.h>
 #include <linux/clk/clk-conf.h>
+#include <linux/platform_device.h>
 
 #include <asm/irq.h>
 
@@ -193,14 +194,16 @@ static const struct dev_pm_ops amba_pm = {
 /*
  * Primecells are part of the Advanced Microcontroller Bus Architecture,
  * so we call the bus "amba".
+ * DMA configuration for platform and AMBA bus is same. So here we reuse
+ * platform's DMA config routine.
  */
 struct bus_type amba_bustype = {
         .name           = "amba",
         .dev_groups     = amba_dev_groups,
         .match          = amba_match,
         .uevent         = amba_uevent,
+        .dma_configure  = platform_dma_configure,
         .pm             = &amba_pm,
-        .force_dma      = true,
 };
 
 static int __init amba_init(void)
diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c
index d82566d6e237..f831a582209c 100644
--- a/drivers/base/dma-mapping.c
+++ b/drivers/base/dma-mapping.c
@@ -329,36 +329,13 @@ void dma_common_free_remap(void *cpu_addr, size_t size, unsigned long vm_flags)
 #endif
 
 /*
- * Common configuration to enable DMA API use for a device
+ * enables DMA API use for a device
  */
-#include <linux/pci.h>
-
 int dma_configure(struct device *dev)
 {
-        struct device *bridge = NULL, *dma_dev = dev;
-        enum dev_dma_attr attr;
-        int ret = 0;
-
-        if (dev_is_pci(dev)) {
-                bridge = pci_get_host_bridge_device(to_pci_dev(dev));
-                dma_dev = bridge;
-                if (IS_ENABLED(CONFIG_OF) && dma_dev->parent &&
-                    dma_dev->parent->of_node)
-                        dma_dev = dma_dev->parent;
-        }
-
-        if (dma_dev->of_node) {
-                ret = of_dma_configure(dev, dma_dev->of_node);
-        } else if (has_acpi_companion(dma_dev)) {
-                attr = acpi_get_dma_attr(to_acpi_device_node(dma_dev->fwnode));
-                if (attr != DEV_DMA_NOT_SUPPORTED)
-                        ret = acpi_dma_configure(dev, attr);
-        }
-
-        if (bridge)
-                pci_put_host_bridge_device(bridge);
-
-        return ret;
+        if (dev->bus->dma_configure)
+                return dev->bus->dma_configure(dev);
+        return 0;
 }
 
 void dma_deconfigure(struct device *dev)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 8075ddc70a17..c0ff1e73a634 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1130,6 +1130,22 @@ int platform_pm_restore(struct device *dev)
 
 #endif /* CONFIG_HIBERNATE_CALLBACKS */
 
+int platform_dma_configure(struct device *dev)
+{
+        enum dev_dma_attr attr;
+        int ret = 0;
+
+        if (dev->of_node) {
+                ret = of_dma_configure(dev, dev->of_node, true);
+        } else if (has_acpi_companion(dev)) {
+                attr = acpi_get_dma_attr(to_acpi_device_node(dev->fwnode));
+                if (attr != DEV_DMA_NOT_SUPPORTED)
+                        ret = acpi_dma_configure(dev, attr);
+        }
+
+        return ret;
+}
+
 static const struct dev_pm_ops platform_dev_pm_ops = {
         .runtime_suspend = pm_generic_runtime_suspend,
         .runtime_resume = pm_generic_runtime_resume,
@@ -1141,8 +1157,8 @@ struct bus_type platform_bus_type = {
         .dev_groups     = platform_dev_groups,
         .match          = platform_match,
         .uevent         = platform_uevent,
+        .dma_configure  = platform_dma_configure,
         .pm             = &platform_dev_pm_ops,
-        .force_dma      = true,
 };
 EXPORT_SYMBOL_GPL(platform_bus_type);
 
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index e6986c7608f1..fc1f4acdd189 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -207,7 +207,7 @@ static void bcma_of_fill_device(struct device *parent,
 
         core->irq = bcma_of_get_irq(parent, core, 0);
 
-        of_dma_configure(&core->dev, node);
+        of_dma_configure(&core->dev, node, false);
 }
 
 unsigned int bcma_core_irq(struct bcma_device *core, int num)
diff --git a/drivers/dma/qcom/hidma_mgmt.c b/drivers/dma/qcom/hidma_mgmt.c
index 000c7019ca7d..d64edeb6771a 100644
--- a/drivers/dma/qcom/hidma_mgmt.c
+++ b/drivers/dma/qcom/hidma_mgmt.c
@@ -398,7 +398,7 @@ static int __init hidma_mgmt_of_populate_channels(struct device_node *np)
                 }
                 of_node_get(child);
                 new_pdev->dev.of_node = child;
-                of_dma_configure(&new_pdev->dev, child);
+                of_dma_configure(&new_pdev->dev, child, true);
                 /*
                  * It is assumed that calling of_msi_configure is safe on
                  * platforms with or without MSI support.
diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c
index 88a3558b7916..815bdb42e3f0 100644
--- a/drivers/gpu/host1x/bus.c
+++ b/drivers/gpu/host1x/bus.c
@@ -314,6 +314,11 @@ static int host1x_device_match(struct device *dev, struct device_driver *drv)
         return strcmp(dev_name(dev), drv->name) == 0;
 }
 
+static int host1x_dma_configure(struct device *dev)
+{
+        return of_dma_configure(dev, dev->of_node, true);
+}
+
 static const struct dev_pm_ops host1x_device_pm_ops = {
         .suspend = pm_generic_suspend,
         .resume = pm_generic_resume,
@@ -326,8 +331,8 @@ static const struct dev_pm_ops host1x_device_pm_ops = {
 struct bus_type host1x_bus_type = {
         .name = "host1x",
         .match = host1x_device_match,
+        .dma_configure  = host1x_dma_configure,
         .pm = &host1x_device_pm_ops,
-        .force_dma = true,
 };
 
 static void __host1x_device_del(struct host1x_device *device)
@@ -416,7 +421,7 @@ static int host1x_device_add(struct host1x *host1x,
         device->dev.bus = &host1x_bus_type;
         device->dev.parent = host1x->dev;
 
-        of_dma_configure(&device->dev, host1x->dev->of_node);
+        of_dma_configure(&device->dev, host1x->dev->of_node, true);
 
         err = host1x_device_parse_dt(device, driver);
         if (err < 0) {
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 54d4d78ca46a..6f344654ef22 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -180,7 +180,6 @@ EXPORT_SYMBOL_GPL(ide_dma_unmap_sg);
 void ide_dma_off_quietly(ide_drive_t *drive)
 {
         drive->dev_flags &= ~IDE_DFLAG_USING_DMA;
-        ide_toggle_bounce(drive, 0);
 
         drive->hwif->dma_ops->dma_host_set(drive, 0);
 }
@@ -211,7 +210,6 @@ EXPORT_SYMBOL(ide_dma_off);
 void ide_dma_on(ide_drive_t *drive)
 {
         drive->dev_flags |= IDE_DFLAG_USING_DMA;
-        ide_toggle_bounce(drive, 1);
 
         drive->hwif->dma_ops->dma_host_set(drive, 1);
 }
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index e1180fa46196..78cb79eddc8b 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -6,32 +6,6 @@
 #include <linux/ide.h>
 #include <linux/bitops.h>
 
-/**
- *      ide_toggle_bounce       -       handle bounce buffering
- *      @drive: drive to update
- *      @on: on/off boolean
- *
- *      Enable or disable bounce buffering for the device. Drives move
- *      between PIO and DMA and that changes the rules we need.
- */
-
-void ide_toggle_bounce(ide_drive_t *drive, int on)
-{
-        u64 addr = BLK_BOUNCE_HIGH;     /* dma64_addr_t */
-
-        if (!PCI_DMA_BUS_IS_PHYS) {
-                addr = BLK_BOUNCE_ANY;
-        } else if (on && drive->media == ide_disk) {
-                struct device *dev = drive->hwif->dev;
-
-                if (dev && dev->dma_mask)
-                        addr = *dev->dma_mask;
-        }
-
-        if (drive->queue)
-                blk_queue_bounce_limit(drive->queue, addr);
-}
-
 u64 ide_get_lba_addr(struct ide_cmd *cmd, int lba48)
 {
         struct ide_taskfile *tf = &cmd->tf;
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 2019e66eada7..56d7bc228cb3 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -796,8 +796,7 @@ static int ide_init_queue(ide_drive_t *drive)
          * This will be fixed once we teach pci_map_sg() about our boundary
          * requirements, hopefully soon. *FIXME*
          */
-        if (!PCI_DMA_BUS_IS_PHYS)
-                max_sg_entries >>= 1;
+        max_sg_entries >>= 1;
 #endif /* CONFIG_PCI */
 
         blk_queue_max_segments(q, max_sg_entries);
@@ -805,9 +804,6 @@ static int ide_init_queue(ide_drive_t *drive)
         /* assign drive queue */
         drive->queue = q;
 
-        /* needs drive->queue to be set */
-        ide_toggle_bounce(drive, 1);
-
         return 0;
 }
 
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index df171cb85822..5b714a062fa7 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -146,6 +146,7 @@ config INTEL_IOMMU
         select DMA_DIRECT_OPS
         select IOMMU_API
         select IOMMU_IOVA
+        select NEED_DMA_MAP_STATE
         select DMAR_TABLE
         help
           DMA remapping (DMAR) devices support enables independent address
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index a4ebd8715494..661828e8fdcf 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1289,9 +1289,8 @@ static int efx_init_io(struct efx_nic *efx)
 
         pci_set_master(pci_dev);
 
-        /* Set the PCI DMA mask.  Try all possibilities from our
-         * genuine mask down to 32 bits, because some architectures
-         * (e.g. x86_64 with iommu_sac_force set) will allow 40 bit
+        /* Set the PCI DMA mask.  Try all possibilities from our genuine mask
+         * down to 32 bits, because some architectures will allow 40 bit
          * masks event though they reject 46 bit masks.
          */
         while (dma_mask > 0x7fffffffUL) {
diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c
index 3d6c91e96589..dd5530a4f8c8 100644
--- a/drivers/net/ethernet/sfc/falcon/efx.c
+++ b/drivers/net/ethernet/sfc/falcon/efx.c
@@ -1242,9 +1242,8 @@ static int ef4_init_io(struct ef4_nic *efx)
 
         pci_set_master(pci_dev);
 
-        /* Set the PCI DMA mask.  Try all possibilities from our
-         * genuine mask down to 32 bits, because some architectures
-         * (e.g. x86_64 with iommu_sac_force set) will allow 40 bit
+        /* Set the PCI DMA mask.  Try all possibilities from our genuine mask
+         * down to 32 bits, because some architectures will allow 40 bit
          * masks event though they reject 46 bit masks.
          */
         while (dma_mask > 0x7fffffffUL) {
diff --git a/drivers/of/device.c b/drivers/of/device.c
index 064c818105bd..33d85511d790 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -76,6 +76,8 @@ int of_device_add(struct platform_device *ofdev)
  * of_dma_configure - Setup DMA configuration
  * @dev:        Device to apply DMA configuration
  * @np:         Pointer to OF node having DMA configuration
+ * @force_dma:  Whether device is to be set up by of_dma_configure() even if
+ *              DMA capability is not explicitly described by firmware.
  *
  * Try to get devices's DMA configuration from DT and update it
  * accordingly.
@@ -84,7 +86,7 @@ int of_device_add(struct platform_device *ofdev)
  * can use a platform bus notifier and handle BUS_NOTIFY_ADD_DEVICE events
  * to fix up DMA configuration.
  */
-int of_dma_configure(struct device *dev, struct device_node *np)
+int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma)
 {
         u64 dma_addr, paddr, size = 0;
         int ret;
@@ -100,7 +102,7 @@ int of_dma_configure(struct device *dev, struct device_node *np)
                  * DMA configuration regardless of whether "dma-ranges" is
                  * correctly specified or not.
                  */
-                if (!dev->bus->force_dma)
+                if (!force_dma)
                         return ret == -ENODEV ? 0 : ret;
 
                 dma_addr = offset = 0;
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index 9a4f4246231d..895c83e0c7b6 100644
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -353,7 +353,7 @@ int of_reserved_mem_device_init_by_idx(struct device *dev,
                 /* ensure that dma_ops is set for virtual devices
                  * using reserved memory
                  */
-                of_dma_configure(dev, np);
+                of_dma_configure(dev, np, true);
 
                 dev_info(dev, "assigned reserved memory node %s\n", rmem->name);
         } else {
diff --git a/drivers/parisc/Kconfig b/drivers/parisc/Kconfig
index 3a102a84d637..5a48b5606110 100644
--- a/drivers/parisc/Kconfig
+++ b/drivers/parisc/Kconfig
@@ -103,11 +103,6 @@ config IOMMU_SBA
         depends on PCI_LBA
         default PCI_LBA
 
-config IOMMU_HELPER
-        bool
-        depends on IOMMU_SBA || IOMMU_CCIO
-        default y
-
 source "drivers/pcmcia/Kconfig"
 
 endmenu
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index d29cedb3f23b..614823617b8b 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -1570,8 +1570,6 @@ static int __init ccio_probe(struct parisc_device *dev)
         }
 #endif
         ioc_count++;
-
-        parisc_has_iommu();
         return 0;
 }
 
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 0d33d1f86d10..11de0eccf968 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1989,8 +1989,6 @@ static int __init sba_driver_callback(struct parisc_device *dev)
         proc_create_single("sba_iommu", 0, root, sba_proc_info);
         proc_create_single("sba_iommu-bitmap", 0, root, sba_proc_bitmap_info);
 #endif
-
-        parisc_has_iommu();
         return 0;
 }
 
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 34b56a8f8480..29a487f31dae 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -5,10 +5,6 @@
 
 source "drivers/pci/pcie/Kconfig"
 
-config PCI_BUS_ADDR_T_64BIT
-        def_bool y if (ARCH_DMA_ADDR_T_64BIT || 64BIT)
-        depends on PCI
-
 config PCI_MSI
         bool "Message Signaled Interrupts (MSI and MSI-X)"
         depends on PCI
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index bc2ded4c451f..35b7fc87eac5 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -120,7 +120,7 @@ int devm_request_pci_bus_resources(struct device *dev,
 EXPORT_SYMBOL_GPL(devm_request_pci_bus_resources);
 
 static struct pci_bus_region pci_32_bit = {0, 0xffffffffULL};
-#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT
+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
 static struct pci_bus_region pci_64_bit = {0,
                                 (pci_bus_addr_t) 0xffffffffffffffffULL};
 static struct pci_bus_region pci_high = {(pci_bus_addr_t) 0x100000000ULL,
@@ -230,7 +230,7 @@ int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
                                           resource_size_t),
                 void *alignf_data)
 {
-#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT
+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
         int rc;
 
         if (res->flags & IORESOURCE_MEM_64) {
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index b9a131137e64..f8269a725667 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -16,6 +16,8 @@
 #include <linux/pm_runtime.h>
 #include <linux/suspend.h>
 #include <linux/kexec.h>
+#include <linux/of_device.h>
+#include <linux/acpi.h>
 #include "pci.h"
 #include "pcie/portdrv.h"
 
@@ -1577,6 +1579,35 @@ static int pci_bus_num_vf(struct device *dev)
         return pci_num_vf(to_pci_dev(dev));
 }
 
+/**
+ * pci_dma_configure - Setup DMA configuration
+ * @dev: ptr to dev structure
+ *
+ * Function to update PCI devices's DMA configuration using the same
+ * info from the OF node or ACPI node of host bridge's parent (if any).
+ */
+static int pci_dma_configure(struct device *dev)
+{
+        struct device *bridge;
+        int ret = 0;
+
+        bridge = pci_get_host_bridge_device(to_pci_dev(dev));
+
+        if (IS_ENABLED(CONFIG_OF) && bridge->parent &&
+            bridge->parent->of_node) {
+                ret = of_dma_configure(dev, bridge->parent->of_node, true);
+        } else if (has_acpi_companion(bridge)) {
+                struct acpi_device *adev = to_acpi_device_node(bridge->fwnode);
+                enum dev_dma_attr attr = acpi_get_dma_attr(adev);
+
+                if (attr != DEV_DMA_NOT_SUPPORTED)
+                        ret = acpi_dma_configure(dev, attr);
+        }
+
+        pci_put_host_bridge_device(bridge);
+        return ret;
+}
+
 struct bus_type pci_bus_type = {
         .name           = "pci",
         .match          = pci_bus_match,
@@ -1589,7 +1620,7 @@ struct bus_type pci_bus_type = {
         .drv_groups     = pci_drv_groups,
         .pm             = PCI_PM_OPS_PTR,
         .num_vf         = pci_bus_num_vf,
-        .force_dma      = true,
+        .dma_configure  = pci_dma_configure,
 };
 EXPORT_SYMBOL(pci_bus_type);
 
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index f125fd71c0f2..fb38aeff9dbd 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2149,27 +2149,6 @@ static int scsi_map_queues(struct blk_mq_tag_set *set)
         return blk_mq_map_queues(set);
 }
 
-static u64 scsi_calculate_bounce_limit(struct Scsi_Host *shost)
-{
-        struct device *host_dev;
-        u64 bounce_limit = 0xffffffff;
-
-        if (shost->unchecked_isa_dma)
-                return BLK_BOUNCE_ISA;
-        /*
-         * Platforms with virtual-DMA translation
-         * hardware have no practical limit.
-         */
-        if (!PCI_DMA_BUS_IS_PHYS)
-                return BLK_BOUNCE_ANY;
-
-        host_dev = scsi_get_device(shost);
-        if (host_dev && host_dev->dma_mask)
-                bounce_limit = (u64)dma_max_pfn(host_dev) << PAGE_SHIFT;
-
-        return bounce_limit;
-}
-
 void __scsi_init_queue(struct Scsi_Host *shost, struct request_queue *q)
 {
         struct device *dev = shost->dma_dev;
@@ -2189,7 +2168,8 @@ void __scsi_init_queue(struct Scsi_Host *shost, struct request_queue *q)
         }
 
         blk_queue_max_hw_sectors(q, shost->max_sectors);
-        blk_queue_bounce_limit(q, scsi_calculate_bounce_limit(shost));
+        if (shost->unchecked_isa_dma)
+                blk_queue_bounce_limit(q, BLK_BOUNCE_ISA);
         blk_queue_segment_boundary(q, shost->dma_boundary);
         dma_set_seg_boundary(dev, shost->dma_boundary);
 
diff --git a/include/asm-generic/dma-mapping.h b/include/asm-generic/dma-mapping.h
index 880a292d792f..ad2868263867 100644
--- a/include/asm-generic/dma-mapping.h
+++ b/include/asm-generic/dma-mapping.h
@@ -4,7 +4,16 @@
 
 static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
 {
+        /*
+         * Use the non-coherent ops if available.  If an architecture wants a
+         * more fine-grained selection of operations it will have to implement
+         * get_arch_dma_ops itself or use the per-device dma_ops.
+         */
+#ifdef CONFIG_DMA_NONCOHERENT_OPS
+        return &dma_noncoherent_ops;
+#else
         return &dma_direct_ops;
+#endif
 }
 
 #endif /* _ASM_GENERIC_DMA_MAPPING_H */
diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h
index 830d7659289b..6bb3cd3d695a 100644
--- a/include/asm-generic/pci.h
+++ b/include/asm-generic/pci.h
@@ -14,12 +14,4 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 }
 #endif /* HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ */
 
-/*
- * By default, assume that no iommu is in use and that the PCI
- * space is mapped to address physical 0.
- */
-#ifndef PCI_DMA_BUS_IS_PHYS
-#define PCI_DMA_BUS_IS_PHYS     (1)
-#endif
-
 #endif /* _ASM_GENERIC_PCI_H */
diff --git a/include/linux/device.h b/include/linux/device.h
index 477956990f5e..00b6c3b42437 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -88,6 +88,8 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
  * @resume:     Called to bring a device on this bus out of sleep mode.
  * @num_vf:     Called to find out how many virtual functions a device on this
  *              bus supports.
+ * @dma_configure:      Called to setup DMA configuration on a device on
+                        this bus.
  * @pm:         Power management operations of this bus, callback the specific
  *              device driver's pm-ops.
  * @iommu_ops:  IOMMU specific operations for this bus, used to attach IOMMU
@@ -96,8 +98,6 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
  * @p:          The private data of the driver core, only the driver core can
  *              touch this.
  * @lock_key:   Lock class key for use by the lock validator
- * @force_dma:  Assume devices on this bus should be set up by dma_configure()
- *              even if DMA capability is not explicitly described by firmware.
  *
  * A bus is a channel between the processor and one or more devices. For the
  * purposes of the device model, all devices are connected via a bus, even if
@@ -130,14 +130,14 @@ struct bus_type {
 
         int (*num_vf)(struct device *dev);
 
+        int (*dma_configure)(struct device *dev);
+
         const struct dev_pm_ops *pm;
 
         const struct iommu_ops *iommu_ops;
 
         struct subsys_private *p;
         struct lock_class_key lock_key;
-
-        bool force_dma;
 };
 
 extern int __must_check bus_register(struct bus_type *bus);
@@ -904,6 +904,8 @@ struct dev_links_info {
  * @offline:    Set after successful invocation of bus type's .offline().
  * @of_node_reused: Set if the device-tree node is shared with an ancestor
  *              device.
+ * @dma_32bit_limit: bridge limited to 32bit DMA even if the device itself
+ *              indicates support for a higher limit in the dma_mask field.
  *
  * At the lowest level, every device in a Linux system is represented by an
  * instance of struct device. The device structure contains the information
@@ -992,6 +994,7 @@ struct device {
         bool                    offline_disabled:1;
         bool                    offline:1;
         bool                    of_node_reused:1;
+        bool                    dma_32bit_limit:1;
 };
 
 static inline struct device *kobj_to_dev(struct kobject *kobj)
diff --git a/include/linux/dma-debug.h b/include/linux/dma-debug.h
index c7d844f09c3a..a785f2507159 100644
--- a/include/linux/dma-debug.h
+++ b/include/linux/dma-debug.h
@@ -30,8 +30,6 @@ struct bus_type;
 
 extern void dma_debug_add_bus(struct bus_type *bus);
 
-extern void dma_debug_init(u32 num_entries);
-
 extern int dma_debug_resize_entries(u32 num_entries);
 
 extern void debug_dma_map_page(struct device *dev, struct page *page,
@@ -100,10 +98,6 @@ static inline void dma_debug_add_bus(struct bus_type *bus)
 {
 }
 
-static inline void dma_debug_init(u32 num_entries)
-{
-}
-
 static inline int dma_debug_resize_entries(u32 num_entries)
 {
         return 0;
diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
index 53ad6a47f513..8d9f33febde5 100644
--- a/include/linux/dma-direct.h
+++ b/include/linux/dma-direct.h
@@ -59,6 +59,11 @@ void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
                 gfp_t gfp, unsigned long attrs);
 void dma_direct_free(struct device *dev, size_t size, void *cpu_addr,
                 dma_addr_t dma_addr, unsigned long attrs);
+dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
+                unsigned long offset, size_t size, enum dma_data_direction dir,
+                unsigned long attrs);
+int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents,
+                enum dma_data_direction dir, unsigned long attrs);
 int dma_direct_supported(struct device *dev, u64 mask);
-
+int dma_direct_mapping_error(struct device *dev, dma_addr_t dma_addr);
 #endif /* _LINUX_DMA_DIRECT_H */
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index f8ab1c0f589e..f9cc309507d9 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -133,10 +133,10 @@ struct dma_map_ops {
 #ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK
         u64 (*get_required_mask)(struct device *dev);
 #endif
-        int is_phys;
 };
 
 extern const struct dma_map_ops dma_direct_ops;
+extern const struct dma_map_ops dma_noncoherent_ops;
 extern const struct dma_map_ops dma_virt_ops;
 
 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
@@ -502,7 +502,7 @@ dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr,
 #define dma_get_sgtable(d, t, v, h, s) dma_get_sgtable_attrs(d, t, v, h, s, 0)
 
 #ifndef arch_dma_alloc_attrs
-#define arch_dma_alloc_attrs(dev, flag) (true)
+#define arch_dma_alloc_attrs(dev)       (true)
 #endif
 
 static inline void *dma_alloc_attrs(struct device *dev, size_t size,
@@ -521,7 +521,7 @@ static inline void *dma_alloc_attrs(struct device *dev, size_t size,
         /* let the implementation decide on the zone to allocate from: */
         flag &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
 
-        if (!arch_dma_alloc_attrs(&dev, &flag))
+        if (!arch_dma_alloc_attrs(&dev))
                 return NULL;
         if (!ops->alloc)
                 return NULL;
@@ -572,14 +572,6 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
         return 0;
 }
 
-/*
- * This is a hack for the legacy x86 forbid_dac and iommu_sac_force. Please
- * don't use this in new code.
- */
-#ifndef arch_dma_supported
-#define arch_dma_supported(dev, mask)   (1)
-#endif
-
 static inline void dma_check_mask(struct device *dev, u64 mask)
 {
         if (sme_active() && (mask < (((u64)sme_get_me_mask() << 1) - 1)))
@@ -592,9 +584,6 @@ static inline int dma_supported(struct device *dev, u64 mask)
 
         if (!ops)
                 return 0;
-        if (!arch_dma_supported(dev, mask))
-                return 0;
-
         if (!ops->dma_supported)
                 return 1;
         return ops->dma_supported(dev, mask);
@@ -839,7 +828,7 @@ static inline int dma_mmap_wc(struct device *dev,
 #define dma_mmap_writecombine dma_mmap_wc
 #endif
 
-#if defined(CONFIG_NEED_DMA_MAP_STATE) || defined(CONFIG_DMA_API_DEBUG)
+#ifdef CONFIG_NEED_DMA_MAP_STATE
 #define DEFINE_DMA_UNMAP_ADDR(ADDR_NAME)        dma_addr_t ADDR_NAME
 #define DEFINE_DMA_UNMAP_LEN(LEN_NAME)          __u32 LEN_NAME
 #define dma_unmap_addr(PTR, ADDR_NAME)           ((PTR)->ADDR_NAME)
diff --git a/include/linux/dma-noncoherent.h b/include/linux/dma-noncoherent.h
new file mode 100644
index 000000000000..10b2654d549b
--- /dev/null
+++ b/include/linux/dma-noncoherent.h
@@ -0,0 +1,47 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _LINUX_DMA_NONCOHERENT_H
+#define _LINUX_DMA_NONCOHERENT_H 1
+
+#include <linux/dma-mapping.h>
+
+void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
+                gfp_t gfp, unsigned long attrs);
+void arch_dma_free(struct device *dev, size_t size, void *cpu_addr,
+                dma_addr_t dma_addr, unsigned long attrs);
+
+#ifdef CONFIG_DMA_NONCOHERENT_MMAP
+int arch_dma_mmap(struct device *dev, struct vm_area_struct *vma,
+                void *cpu_addr, dma_addr_t dma_addr, size_t size,
+                unsigned long attrs);
+#else
+#define arch_dma_mmap NULL
+#endif /* CONFIG_DMA_NONCOHERENT_MMAP */
+
+#ifdef CONFIG_DMA_NONCOHERENT_CACHE_SYNC
+void arch_dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+                enum dma_data_direction direction);
+#else
+#define arch_dma_cache_sync NULL
+#endif /* CONFIG_DMA_NONCOHERENT_CACHE_SYNC */
+
+#ifdef CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE
+void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr,
+                size_t size, enum dma_data_direction dir);
+#else
+static inline void arch_sync_dma_for_device(struct device *dev,
+                phys_addr_t paddr, size_t size, enum dma_data_direction dir)
+{
+}
+#endif /* ARCH_HAS_SYNC_DMA_FOR_DEVICE */
+
+#ifdef CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU
+void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,
+                size_t size, enum dma_data_direction dir);
+#else
+static inline void arch_sync_dma_for_cpu(struct device *dev,
+                phys_addr_t paddr, size_t size, enum dma_data_direction dir)
+{
+}
+#endif /* ARCH_HAS_SYNC_DMA_FOR_CPU */
+
+#endif /* _LINUX_DMA_NONCOHERENT_H */
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 752464f5a772..c74b0321922a 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1508,8 +1508,6 @@ static inline void ide_set_hwifdata (ide_hwif_t * hwif, void *data)
         hwif->hwif_data = data;
 }
 
-extern void ide_toggle_bounce(ide_drive_t *drive, int on);
-
 u64 ide_get_lba_addr(struct ide_cmd *, int);
 u8 ide_dump_status(ide_drive_t *, const char *, u8);
 
diff --git a/include/linux/iommu-helper.h b/include/linux/iommu-helper.h
index cb9a9248c8c0..70d01edcbf8b 100644
--- a/include/linux/iommu-helper.h
+++ b/include/linux/iommu-helper.h
@@ -2,6 +2,7 @@
 #ifndef _LINUX_IOMMU_HELPER_H
 #define _LINUX_IOMMU_HELPER_H
 
+#include <linux/bug.h>
 #include <linux/kernel.h>
 
 static inline unsigned long iommu_device_max_index(unsigned long size,
@@ -14,9 +15,15 @@ static inline unsigned long iommu_device_max_index(unsigned long size,
                 return size;
 }
 
-extern int iommu_is_span_boundary(unsigned int index, unsigned int nr,
-                                  unsigned long shift,
-                                  unsigned long boundary_size);
+static inline int iommu_is_span_boundary(unsigned int index, unsigned int nr,
+                unsigned long shift, unsigned long boundary_size)
+{
+        BUG_ON(!is_power_of_2(boundary_size));
+
+        shift = (shift + index) & (boundary_size - 1);
+        return shift + nr > boundary_size;
+}
+
 extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size,
                                       unsigned long start, unsigned int nr,
                                       unsigned long shift,
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 8da5a1b31ece..165fd302b442 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -55,7 +55,9 @@ static inline struct device_node *of_cpu_device_node_get(int cpu)
         return of_node_get(cpu_dev->of_node);
 }
 
-int of_dma_configure(struct device *dev, struct device_node *np);
+int of_dma_configure(struct device *dev,
+                     struct device_node *np,
+                     bool force_dma);
 void of_dma_deconfigure(struct device *dev);
 #else /* CONFIG_OF */
 
@@ -105,7 +107,9 @@ static inline struct device_node *of_cpu_device_node_get(int cpu)
         return NULL;
 }
 
-static inline int of_dma_configure(struct device *dev, struct device_node *np)
+static inline int of_dma_configure(struct device *dev,
+                                   struct device_node *np,
+                                   bool force_dma)
 {
         return 0;
 }
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 73178a2fcee0..55371cb827ad 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -670,7 +670,7 @@ int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
 int raw_pci_write(unsigned int domain, unsigned int bus, unsigned int devfn,
                   int reg, int len, u32 val);
 
-#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT
+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
 typedef u64 pci_bus_addr_t;
 #else
 typedef u32 pci_bus_addr_t;
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 49f634d96118..3097c943fab9 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -356,6 +356,8 @@ extern int platform_pm_restore(struct device *dev);
 #define platform_pm_restore             NULL
 #endif
 
+extern int platform_dma_configure(struct device *dev);
+
 #ifdef CONFIG_PM_SLEEP
 #define USE_PLATFORM_PM_SLEEP_OPS \
         .suspend = platform_pm_suspend, \
diff --git a/lib/Kconfig b/lib/Kconfig
index 5fe577673b98..7a913937888b 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -429,15 +429,50 @@ config SGL_ALLOC
         bool
         default n
 
+config NEED_SG_DMA_LENGTH
+        bool
+
+config NEED_DMA_MAP_STATE
+        bool
+
+config ARCH_DMA_ADDR_T_64BIT
+        def_bool 64BIT || PHYS_ADDR_T_64BIT
+
+config IOMMU_HELPER
+        bool
+
+config ARCH_HAS_SYNC_DMA_FOR_DEVICE
+        bool
+
+config ARCH_HAS_SYNC_DMA_FOR_CPU
+        bool
+        select NEED_DMA_MAP_STATE
+
 config DMA_DIRECT_OPS
         bool
-        depends on HAS_DMA && (!64BIT || ARCH_DMA_ADDR_T_64BIT)
-        default n
+        depends on HAS_DMA
+
+config DMA_NONCOHERENT_OPS
+        bool
+        depends on HAS_DMA
+        select DMA_DIRECT_OPS
+
+config DMA_NONCOHERENT_MMAP
+        bool
+        depends on DMA_NONCOHERENT_OPS
+
+config DMA_NONCOHERENT_CACHE_SYNC
+        bool
+        depends on DMA_NONCOHERENT_OPS
 
 config DMA_VIRT_OPS
         bool
-        depends on HAS_DMA && (!64BIT || ARCH_DMA_ADDR_T_64BIT)
-        default n
+        depends on HAS_DMA
+
+config SWIOTLB
+        bool
+        select DMA_DIRECT_OPS
+        select NEED_DMA_MAP_STATE
 
 config CHECK_SIGNATURE
         bool
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c40c7b734cd1..76555479ae36 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1634,7 +1634,7 @@ config PROVIDE_OHCI1394_DMA_INIT
 
 config DMA_API_DEBUG
         bool "Enable debugging of DMA-API usage"
-        depends on HAVE_DMA_API_DEBUG
+        select NEED_DMA_MAP_STATE
         help
           Enable this option to debug the use of the DMA API by device drivers.
           With this option you will be able to detect common bugs in device
@@ -1651,6 +1651,23 @@ config DMA_API_DEBUG
 
           If unsure, say N.
 
+config DMA_API_DEBUG_SG
+        bool "Debug DMA scatter-gather usage"
+        default y
+        depends on DMA_API_DEBUG
+        help
+          Perform extra checking that callers of dma_map_sg() have respected the
+          appropriate segment length/boundary limits for the given device when
+          preparing DMA scatterlists.
+
+          This is particularly likely to have been overlooked in cases where the
+          dma_map_sg() API is used for general bulk mapping of pages rather than
+          preparing literal scatter-gather descriptors, where there is a risk of
+          unexpected behaviour from DMA API implementations if the scatterlist
+          is technically out-of-spec.
+
+          If unsure, say N.
+
 menuconfig RUNTIME_TESTING_MENU
         bool "Runtime Testing"
         def_bool y
diff --git a/lib/Makefile b/lib/Makefile
index ce20696d5a92..9f18c8152281 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -30,6 +30,7 @@ lib-$(CONFIG_PRINTK) += dump_stack.o
 lib-$(CONFIG_MMU) += ioremap.o
 lib-$(CONFIG_SMP) += cpumask.o
 lib-$(CONFIG_DMA_DIRECT_OPS) += dma-direct.o
+lib-$(CONFIG_DMA_NONCOHERENT_OPS) += dma-noncoherent.o
 lib-$(CONFIG_DMA_VIRT_OPS) += dma-virt.o
 
 lib-y   += kobject.o klist.o
@@ -147,7 +148,7 @@ obj-$(CONFIG_AUDIT_GENERIC) += audit.o
 obj-$(CONFIG_AUDIT_COMPAT_GENERIC) += compat_audit.o
 
 obj-$(CONFIG_SWIOTLB) += swiotlb.o
-obj-$(CONFIG_IOMMU_HELPER) += iommu-helper.o iommu-common.o
+obj-$(CONFIG_IOMMU_HELPER) += iommu-helper.o
 obj-$(CONFIG_FAULT_INJECTION) += fault-inject.o
 obj-$(CONFIG_NOTIFIER_ERROR_INJECTION) += notifier-error-inject.o
 obj-$(CONFIG_PM_NOTIFIER_ERROR_INJECT) += pm-notifier-error-inject.o
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 7f5cdc1e6b29..c007d25bee09 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -41,6 +41,11 @@
 #define HASH_FN_SHIFT   13
 #define HASH_FN_MASK    (HASH_SIZE - 1)
 
+/* allow architectures to override this if absolutely required */
+#ifndef PREALLOC_DMA_DEBUG_ENTRIES
+#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
+#endif
+
 enum {
         dma_debug_single,
         dma_debug_page,
@@ -127,7 +132,7 @@ static u32 min_free_entries;
 static u32 nr_total_entries;
 
 /* number of preallocated entries requested by kernel cmdline */
-static u32 req_entries;
+static u32 nr_prealloc_entries = PREALLOC_DMA_DEBUG_ENTRIES;
 
 /* debugfs dentry's for the stuff above */
 static struct dentry *dma_debug_dent        __read_mostly;
@@ -439,7 +444,6 @@ void debug_dma_dump_mappings(struct device *dev)
                 spin_unlock_irqrestore(&bucket->lock, flags);
         }
 }
-EXPORT_SYMBOL(debug_dma_dump_mappings);
 
 /*
  * For each mapping (initial cacheline in the case of
@@ -748,7 +752,6 @@ int dma_debug_resize_entries(u32 num_entries)
 
         return ret;
 }
-EXPORT_SYMBOL(dma_debug_resize_entries);
 
 /*
  * DMA-API debugging init code
@@ -1004,10 +1007,7 @@ void dma_debug_add_bus(struct bus_type *bus)
         bus_register_notifier(bus, nb);
 }
 
-/*
- * Let the architectures decide how many entries should be preallocated.
- */
-void dma_debug_init(u32 num_entries)
+static int dma_debug_init(void)
 {
         int i;
 
@@ -1015,7 +1015,7 @@ void dma_debug_init(u32 num_entries)
          * called to set dma_debug_initialized
          */
         if (global_disable)
-                return;
+                return 0;
 
         for (i = 0; i < HASH_SIZE; ++i) {
                 INIT_LIST_HEAD(&dma_entry_hash[i].list);
@@ -1026,17 +1026,14 @@ void dma_debug_init(u32 num_entries)
                 pr_err("DMA-API: error creating debugfs entries - disabling\n");
                 global_disable = true;
 
-                return;
+                return 0;
         }
 
-        if (req_entries)
-                num_entries = req_entries;
-
-        if (prealloc_memory(num_entries) != 0) {
+        if (prealloc_memory(nr_prealloc_entries) != 0) {
                 pr_err("DMA-API: debugging out of memory error - disabled\n");
                 global_disable = true;
 
-                return;
+                return 0;
         }
 
         nr_total_entries = num_free_entries;
@@ -1044,7 +1041,9 @@ void dma_debug_init(u32 num_entries)
         dma_debug_initialized = true;
 
         pr_info("DMA-API: debugging enabled by kernel config\n");
+        return 0;
 }
+core_initcall(dma_debug_init);
 
 static __init int dma_debug_cmdline(char *str)
 {
@@ -1061,16 +1060,10 @@ static __init int dma_debug_cmdline(char *str)
 
 static __init int dma_debug_entries_cmdline(char *str)
 {
-        int res;
-
         if (!str)
                 return -EINVAL;
-
-        res = get_option(&str, &req_entries);
-
-        if (!res)
-                req_entries = 0;
-
+        if (!get_option(&str, &nr_prealloc_entries))
+                nr_prealloc_entries = PREALLOC_DMA_DEBUG_ENTRIES;
         return 0;
 }
 
@@ -1293,6 +1286,32 @@ out:
         put_hash_bucket(bucket, &flags);
 }
 
+static void check_sg_segment(struct device *dev, struct scatterlist *sg)
+{
+#ifdef CONFIG_DMA_API_DEBUG_SG
+        unsigned int max_seg = dma_get_max_seg_size(dev);
+        u64 start, end, boundary = dma_get_seg_boundary(dev);
+
+        /*
+         * Either the driver forgot to set dma_parms appropriately, or
+         * whoever generated the list forgot to check them.
+         */
+        if (sg->length > max_seg)
+                err_printk(dev, NULL, "DMA-API: mapping sg segment longer than device claims to support [len=%u] [max=%u]\n",
+                           sg->length, max_seg);
+        /*
+         * In some cases this could potentially be the DMA API
+         * implementation's fault, but it would usually imply that
+         * the scatterlist was built inappropriately to begin with.
+         */
+        start = sg_dma_address(sg);
+        end = start + sg_dma_len(sg) - 1;
+        if ((start ^ end) & ~boundary)
+                err_printk(dev, NULL, "DMA-API: mapping sg segment across boundary [start=0x%016llx] [end=0x%016llx] [boundary=0x%016llx]\n",
+                           start, end, boundary);
+#endif
+}
+
 void debug_dma_map_page(struct device *dev, struct page *page, size_t offset,
                         size_t size, int direction, dma_addr_t dma_addr,
                         bool map_single)
@@ -1423,6 +1442,8 @@ void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
                         check_for_illegal_area(dev, sg_virt(s), sg_dma_len(s));
                 }
 
+                check_sg_segment(dev, s);
+
                 add_dma_entry(entry);
         }
 }
diff --git a/lib/dma-direct.c b/lib/dma-direct.c
index bbfb229aa067..8be8106270c2 100644
--- a/lib/dma-direct.c
+++ b/lib/dma-direct.c
@@ -34,6 +34,13 @@ check_addr(struct device *dev, dma_addr_t dma_addr, size_t size,
                 const char *caller)
 {
         if (unlikely(dev && !dma_capable(dev, dma_addr, size))) {
+                if (!dev->dma_mask) {
+                        dev_err(dev,
+                                "%s: call on device without dma_mask\n",
+                                caller);
+                        return false;
+                }
+
                 if (*dev->dma_mask >= DMA_BIT_MASK(32)) {
                         dev_err(dev,
                                 "%s: overflow %pad+%zu of device mask %llx\n",
@@ -84,6 +91,13 @@ again:
                 __free_pages(page, page_order);
                 page = NULL;
 
+                if (IS_ENABLED(CONFIG_ZONE_DMA32) &&
+                    dev->coherent_dma_mask < DMA_BIT_MASK(64) &&
+                    !(gfp & (GFP_DMA32 | GFP_DMA))) {
+                        gfp |= GFP_DMA32;
+                        goto again;
+                }
+
                 if (IS_ENABLED(CONFIG_ZONE_DMA) &&
                     dev->coherent_dma_mask < DMA_BIT_MASK(32) &&
                     !(gfp & GFP_DMA)) {
@@ -121,7 +135,7 @@ void dma_direct_free(struct device *dev, size_t size, void *cpu_addr,
                 free_pages((unsigned long)cpu_addr, page_order);
 }
 
-static dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
+dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
                 unsigned long offset, size_t size, enum dma_data_direction dir,
                 unsigned long attrs)
 {
@@ -132,8 +146,8 @@ static dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
         return dma_addr;
 }
 
-static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
-                int nents, enum dma_data_direction dir, unsigned long attrs)
+int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents,
+                enum dma_data_direction dir, unsigned long attrs)
 {
         int i;
         struct scatterlist *sg;
@@ -165,10 +179,16 @@ int dma_direct_supported(struct device *dev, u64 mask)
         if (mask < DMA_BIT_MASK(32))
                 return 0;
 #endif
+        /*
+         * Various PCI/PCIe bridges have broken support for > 32bit DMA even
+         * if the device itself might support it.
+         */
+        if (dev->dma_32bit_limit && mask > DMA_BIT_MASK(32))
+                return 0;
         return 1;
 }
 
-static int dma_direct_mapping_error(struct device *dev, dma_addr_t dma_addr)
+int dma_direct_mapping_error(struct device *dev, dma_addr_t dma_addr)
 {
         return dma_addr == DIRECT_MAPPING_ERROR;
 }
@@ -180,6 +200,5 @@ const struct dma_map_ops dma_direct_ops = {
         .map_sg                 = dma_direct_map_sg,
         .dma_supported          = dma_direct_supported,
         .mapping_error          = dma_direct_mapping_error,
-        .is_phys                = 1,
 };
 EXPORT_SYMBOL(dma_direct_ops);
diff --git a/lib/dma-noncoherent.c b/lib/dma-noncoherent.c
new file mode 100644
index 000000000000..79e9a757387f
--- /dev/null
+++ b/lib/dma-noncoherent.c
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2018 Christoph Hellwig.
+ *
+ * DMA operations that map physical memory directly without providing cache
+ * coherence.
+ */
+#include <linux/export.h>
+#include <linux/mm.h>
+#include <linux/dma-direct.h>
+#include <linux/dma-noncoherent.h>
+#include <linux/scatterlist.h>
+
+static void dma_noncoherent_sync_single_for_device(struct device *dev,
+                dma_addr_t addr, size_t size, enum dma_data_direction dir)
+{
+        arch_sync_dma_for_device(dev, dma_to_phys(dev, addr), size, dir);
+}
+
+static void dma_noncoherent_sync_sg_for_device(struct device *dev,
+                struct scatterlist *sgl, int nents, enum dma_data_direction dir)
+{
+        struct scatterlist *sg;
+        int i;
+
+        for_each_sg(sgl, sg, nents, i)
+                arch_sync_dma_for_device(dev, sg_phys(sg), sg->length, dir);
+}
+
+static dma_addr_t dma_noncoherent_map_page(struct device *dev, struct page *page,
+                unsigned long offset, size_t size, enum dma_data_direction dir,
+                unsigned long attrs)
+{
+        dma_addr_t addr;
+
+        addr = dma_direct_map_page(dev, page, offset, size, dir, attrs);
+        if (!dma_mapping_error(dev, addr) && !(attrs & DMA_ATTR_SKIP_CPU_SYNC))
+                arch_sync_dma_for_device(dev, page_to_phys(page) + offset,
+                                size, dir);
+        return addr;
+}
+
+static int dma_noncoherent_map_sg(struct device *dev, struct scatterlist *sgl,
+                int nents, enum dma_data_direction dir, unsigned long attrs)
+{
+        nents = dma_direct_map_sg(dev, sgl, nents, dir, attrs);
+        if (nents > 0 && !(attrs & DMA_ATTR_SKIP_CPU_SYNC))
+                dma_noncoherent_sync_sg_for_device(dev, sgl, nents, dir);
+        return nents;
+}
+
+#ifdef CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU
+static void dma_noncoherent_sync_single_for_cpu(struct device *dev,
+                dma_addr_t addr, size_t size, enum dma_data_direction dir)
+{
+        arch_sync_dma_for_cpu(dev, dma_to_phys(dev, addr), size, dir);
+}
+
+static void dma_noncoherent_sync_sg_for_cpu(struct device *dev,
+                struct scatterlist *sgl, int nents, enum dma_data_direction dir)
+{
+        struct scatterlist *sg;
+        int i;
+
+        for_each_sg(sgl, sg, nents, i)
+                arch_sync_dma_for_cpu(dev, sg_phys(sg), sg->length, dir);
+}
+
+static void dma_noncoherent_unmap_page(struct device *dev, dma_addr_t addr,
+                size_t size, enum dma_data_direction dir, unsigned long attrs)
+{
+        if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
+                dma_noncoherent_sync_single_for_cpu(dev, addr, size, dir);
+}
+
+static void dma_noncoherent_unmap_sg(struct device *dev, struct scatterlist *sgl,
+                int nents, enum dma_data_direction dir, unsigned long attrs)
+{
+        if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
+                dma_noncoherent_sync_sg_for_cpu(dev, sgl, nents, dir);
+}
+#endif
+
+const struct dma_map_ops dma_noncoherent_ops = {
+        .alloc                  = arch_dma_alloc,
+        .free                   = arch_dma_free,
+        .mmap                   = arch_dma_mmap,
+        .sync_single_for_device = dma_noncoherent_sync_single_for_device,
+        .sync_sg_for_device     = dma_noncoherent_sync_sg_for_device,
+        .map_page               = dma_noncoherent_map_page,
+        .map_sg                 = dma_noncoherent_map_sg,
+#ifdef CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU
+        .sync_single_for_cpu    = dma_noncoherent_sync_single_for_cpu,
+        .sync_sg_for_cpu        = dma_noncoherent_sync_sg_for_cpu,
+        .unmap_page             = dma_noncoherent_unmap_page,
+        .unmap_sg               = dma_noncoherent_unmap_sg,
+#endif
+        .dma_supported          = dma_direct_supported,
+        .mapping_error          = dma_direct_mapping_error,
+        .cache_sync             = arch_dma_cache_sync,
+};
+EXPORT_SYMBOL(dma_noncoherent_ops);
diff --git a/lib/iommu-helper.c b/lib/iommu-helper.c
index 23633c0fda4a..92a9f243c0e2 100644
--- a/lib/iommu-helper.c
+++ b/lib/iommu-helper.c
@@ -3,19 +3,8 @@
  * IOMMU helper functions for the free area management
  */
 
-#include <linux/export.h>
 #include <linux/bitmap.h>
-#include <linux/bug.h>
-
-int iommu_is_span_boundary(unsigned int index, unsigned int nr,
-                           unsigned long shift,
-                           unsigned long boundary_size)
-{
-        BUG_ON(!is_power_of_2(boundary_size));
-
-        shift = (shift + index) & (boundary_size - 1);
-        return shift + nr > boundary_size;
-}
+#include <linux/iommu-helper.h>
 
 unsigned long iommu_area_alloc(unsigned long *map, unsigned long size,
                                unsigned long start, unsigned int nr,
@@ -38,4 +27,3 @@ again:
         }
         return -1;
 }
-EXPORT_SYMBOL(iommu_area_alloc);
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index cc640588f145..04b68d9dffac 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -593,9 +593,8 @@ found:
 }
 
 /*
- * Allocates bounce buffer and returns its kernel virtual address.
+ * Allocates bounce buffer and returns its physical address.
  */
-
 static phys_addr_t
 map_single(struct device *hwdev, phys_addr_t phys, size_t size,
            enum dma_data_direction dir, unsigned long attrs)
@@ -614,7 +613,7 @@ map_single(struct device *hwdev, phys_addr_t phys, size_t size,
 }
 
 /*
- * dma_addr is the kernel virtual address of the bounce buffer to unmap.
+ * 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,
@@ -692,7 +691,6 @@ void swiotlb_tbl_sync_single(struct device *hwdev, phys_addr_t tlb_addr,
         }
 }
 
-#ifdef CONFIG_DMA_DIRECT_OPS
 static inline bool dma_coherent_ok(struct device *dev, dma_addr_t addr,
                 size_t size)
 {
@@ -727,7 +725,7 @@ swiotlb_alloc_buffer(struct device *dev, size_t size, dma_addr_t *dma_handle,
 
 out_unmap:
         dev_warn(dev, "hwdev DMA mask = 0x%016Lx, dev_addr = 0x%016Lx\n",
-                (unsigned long long)(dev ? dev->coherent_dma_mask : 0),
+                (unsigned long long)dev->coherent_dma_mask,
                 (unsigned long long)*dma_handle);
 
         /*
@@ -764,7 +762,6 @@ static bool swiotlb_free_buffer(struct device *dev, size_t size,
                                  DMA_ATTR_SKIP_CPU_SYNC);
         return true;
 }
-#endif
 
 static void
 swiotlb_full(struct device *dev, size_t size, enum dma_data_direction dir,
@@ -1045,7 +1042,6 @@ swiotlb_dma_supported(struct device *hwdev, u64 mask)
         return __phys_to_dma(hwdev, io_tlb_end - 1) <= mask;
 }
 
-#ifdef CONFIG_DMA_DIRECT_OPS
 void *swiotlb_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
                 gfp_t gfp, unsigned long attrs)
 {
@@ -1089,4 +1085,3 @@ const struct dma_map_ops swiotlb_dma_ops = {
         .unmap_page             = swiotlb_unmap_page,
         .dma_supported          = dma_direct_supported,
 };
-#endif /* CONFIG_DMA_DIRECT_OPS */
diff --git a/mm/Kconfig b/mm/Kconfig
index e14c01513bfd..9673e7fbb4f0 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -266,7 +266,7 @@ config ARCH_ENABLE_THP_MIGRATION
         bool
 
 config PHYS_ADDR_T_64BIT
-        def_bool 64BIT || ARCH_PHYS_ADDR_T_64BIT
+        def_bool 64BIT
 
 config BOUNCE
         bool "Enable bounce buffers"
diff --git a/net/core/dev.c b/net/core/dev.c
index 2af787e8b130..983b277a1229 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2884,11 +2884,7 @@ void netdev_rx_csum_fault(struct net_device *dev)
 EXPORT_SYMBOL(netdev_rx_csum_fault);
 #endif
 
-/* Actually, we should eliminate this check as soon as we know, that:
- * 1. IOMMU is present and allows to map all the memory.
- * 2. No high memory really exists on this machine.
- */
-
+/* XXX: check that highmem exists at all on the given machine. */
 static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
 {
 #ifdef CONFIG_HIGHMEM
@@ -2902,20 +2898,6 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
                                 return 1;
                 }
         }
-
-        if (PCI_DMA_BUS_IS_PHYS) {
-                struct device *pdev = dev->dev.parent;
-
-                if (!pdev)
-                        return 0;
-                for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-                        skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-                        dma_addr_t addr = page_to_phys(skb_frag_page(frag));
-
-                        if (!pdev->dma_mask || addr + PAGE_SIZE - 1 > *pdev->dma_mask)
-                                return 1;
-                }
-        }
 #endif
         return 0;
 }
diff --git a/tools/virtio/linux/dma-mapping.h b/tools/virtio/linux/dma-mapping.h
index 1571e24e9494..f91aeb5fe571 100644
--- a/tools/virtio/linux/dma-mapping.h
+++ b/tools/virtio/linux/dma-mapping.h
@@ -6,8 +6,6 @@
 # error Virtio userspace code does not support CONFIG_HAS_DMA
 #endif
 
-#define PCI_DMA_BUS_IS_PHYS 1
-
 enum dma_data_direction {
         DMA_BIDIRECTIONAL = 0,
         DMA_TO_DEVICE = 1,