arch: define the ARCH_DMA_ADDR_T_64BIT config symbol in lib/Kconfig

Define this symbol if the architecture either uses 64-bit pointers or the
PHYS_ADDR_T_64BIT is set.  This covers 95% of the old arch magic.  We only
need an additional select for Xen on ARM (why anyway?), and we now always
set ARCH_DMA_ADDR_T_64BIT on mips boards with 64-bit physical addressing
instead of only doing it when highmem is set.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: James Hogan <jhogan@kernel.org>

19 files changed, 3 insertions, 42 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 1fd9645b0c67..aa7df1a36fd0 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -66,9 +66,6 @@ config ZONE_DMA
         bool
         default y
 
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool y
-
 config GENERIC_ISA_DMA
         bool
         default y
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index f94c61da682a..7498aca4b887 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -458,9 +458,6 @@ config ARC_HAS_PAE40
           Enable access to physical memory beyond 4G, only supported on
           ARC cores with 40 bit Physical Addressing support
 
-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/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 2f77c6344ef1..5a016bc80e26 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -674,9 +674,6 @@ config ARM_PV_FIXUP
         def_bool y
         depends on ARM_LPAE && ARM_PATCH_PHYS_VIRT && ARCH_KEYSTONE
 
-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/arm64/Kconfig b/arch/arm64/Kconfig
index e36fdf69e5e4..9edcb141bed1 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -235,9 +235,6 @@ config ZONE_DMA32
 config HAVE_GENERIC_GUP
         def_bool y
 
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool y
-
 config SMP
         def_bool y
 
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 7fd94b41b6da..940326409c60 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -79,9 +79,6 @@ config MMU
         bool
         default y
 
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool y
-
 config SWIOTLB
        bool
 
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 500191999dd2..82934f27b0d5 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1100,9 +1100,6 @@ config GPIO_TXX9
 config FW_CFE
         bool
 
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool (HIGHMEM && PHYS_ADDR_T_64BIT) || 64BIT
-
 config ARCH_SUPPORTS_UPROBES
         bool
 
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index e90671fa6338..e5da6b40d42c 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -13,9 +13,6 @@ config 64BIT
         bool
         default y if PPC64
 
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool PHYS_ADDR_T_64BIT
-
 config MMU
         bool
         default y
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 1b4b722b4496..c27bac1d4f65 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -44,9 +44,6 @@ config ZONE_DMA32
         bool
         default y
 
-config ARCH_DMA_ADDR_T_64BIT
-        def_bool y
-
 config PAGE_OFFSET
         hex
         default 0xC0000000 if 32BIT && MAXPHYSMEM_2GB
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 6bdac4c2a64a..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
 
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 304c94b50171..435dbc033afe 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -104,10 +104,6 @@ config ARCH_ATU
         bool
         default y if SPARC64
 
-config ARCH_DMA_ADDR_T_64BIT
-        bool
-        default y if ARCH_ATU
-
 config STACKTRACE_SUPPORT
         bool
         default y if SPARC64
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 79586654ea54..31aad36d7ba9 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1479,10 +1479,6 @@ config X86_5LEVEL
 
           Say N if unsure.
 
-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/lib/Kconfig b/lib/Kconfig
index ce9fa962d59b..1f12faf03819 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -435,6 +435,9 @@ config NEED_SG_DMA_LENGTH
 config NEED_DMA_MAP_STATE
         bool
 
+config ARCH_DMA_ADDR_T_64BIT
+        def_bool 64BIT || PHYS_ADDR_T_64BIT
+
 config IOMMU_HELPER
         bool