Commit a4ce5a48 authored by Christoph Hellwig's avatar Christoph Hellwig

iommu-helper: move the IOMMU_HELPER config symbol to lib/

This way we have one central definition of it, and user can select it as
needed.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAnshuman Khandual <khandual@linux.vnet.ibm.com>
parent 79c1879e
...@@ -222,6 +222,7 @@ config PPC ...@@ -222,6 +222,7 @@ config PPC
select HAVE_SYSCALL_TRACEPOINTS select HAVE_SYSCALL_TRACEPOINTS
select HAVE_VIRT_CPU_ACCOUNTING select HAVE_VIRT_CPU_ACCOUNTING
select HAVE_IRQ_TIME_ACCOUNTING select HAVE_IRQ_TIME_ACCOUNTING
select IOMMU_HELPER if PPC64
select IRQ_DOMAIN select IRQ_DOMAIN
select IRQ_FORCED_THREADING select IRQ_FORCED_THREADING
select MODULES_USE_ELF_RELA select MODULES_USE_ELF_RELA
...@@ -477,9 +478,6 @@ config MPROFILE_KERNEL ...@@ -477,9 +478,6 @@ config MPROFILE_KERNEL
depends on PPC64 && CPU_LITTLE_ENDIAN depends on PPC64 && CPU_LITTLE_ENDIAN
def_bool !DISABLE_MPROFILE_KERNEL def_bool !DISABLE_MPROFILE_KERNEL
config IOMMU_HELPER
def_bool PPC64
config SWIOTLB config SWIOTLB
bool "SWIOTLB support" bool "SWIOTLB support"
default n default n
......
...@@ -708,7 +708,9 @@ config QDIO ...@@ -708,7 +708,9 @@ config QDIO
menuconfig PCI menuconfig PCI
bool "PCI support" bool "PCI support"
select PCI_MSI select PCI_MSI
select IOMMU_HELPER
select IOMMU_SUPPORT select IOMMU_SUPPORT
help help
Enable PCI support. Enable PCI support.
...@@ -732,9 +734,6 @@ config PCI_DOMAINS ...@@ -732,9 +734,6 @@ config PCI_DOMAINS
config HAS_IOMEM config HAS_IOMEM
def_bool PCI def_bool PCI
config IOMMU_HELPER
def_bool PCI
config NEED_SG_DMA_LENGTH config NEED_SG_DMA_LENGTH
def_bool PCI def_bool PCI
......
...@@ -66,6 +66,7 @@ config SPARC64 ...@@ -66,6 +66,7 @@ config SPARC64
select HAVE_SYSCALL_TRACEPOINTS select HAVE_SYSCALL_TRACEPOINTS
select HAVE_CONTEXT_TRACKING select HAVE_CONTEXT_TRACKING
select HAVE_DEBUG_KMEMLEAK select HAVE_DEBUG_KMEMLEAK
select IOMMU_HELPER
select SPARSE_IRQ select SPARSE_IRQ
select RTC_DRV_CMOS select RTC_DRV_CMOS
select RTC_DRV_BQ4802 select RTC_DRV_BQ4802
...@@ -105,10 +106,6 @@ config ARCH_DMA_ADDR_T_64BIT ...@@ -105,10 +106,6 @@ config ARCH_DMA_ADDR_T_64BIT
bool bool
default y if ARCH_ATU default y if ARCH_ATU
config IOMMU_HELPER
bool
default y if SPARC64
config STACKTRACE_SUPPORT config STACKTRACE_SUPPORT
bool bool
default y if SPARC64 default y if SPARC64
......
...@@ -874,6 +874,7 @@ config DMI ...@@ -874,6 +874,7 @@ config DMI
config GART_IOMMU config GART_IOMMU
bool "Old AMD GART IOMMU support" bool "Old AMD GART IOMMU support"
select IOMMU_HELPER
select SWIOTLB select SWIOTLB
depends on X86_64 && PCI && AMD_NB depends on X86_64 && PCI && AMD_NB
---help--- ---help---
...@@ -895,6 +896,7 @@ config GART_IOMMU ...@@ -895,6 +896,7 @@ config GART_IOMMU
config CALGARY_IOMMU config CALGARY_IOMMU
bool "IBM Calgary IOMMU support" bool "IBM Calgary IOMMU support"
select IOMMU_HELPER
select SWIOTLB select SWIOTLB
depends on X86_64 && PCI depends on X86_64 && PCI
---help--- ---help---
...@@ -932,10 +934,6 @@ config SWIOTLB ...@@ -932,10 +934,6 @@ config SWIOTLB
with more than 3 GB of memory. with more than 3 GB of memory.
If unsure, say Y. If unsure, say Y.
config IOMMU_HELPER
def_bool y
depends on CALGARY_IOMMU || GART_IOMMU
config MAXSMP config MAXSMP
bool "Enable Maximum number of SMP Processors and NUMA Nodes" bool "Enable Maximum number of SMP Processors and NUMA Nodes"
depends on X86_64 && SMP && DEBUG_KERNEL depends on X86_64 && SMP && DEBUG_KERNEL
......
...@@ -429,6 +429,9 @@ config SGL_ALLOC ...@@ -429,6 +429,9 @@ config SGL_ALLOC
bool bool
default n default n
config IOMMU_HELPER
bool
config DMA_DIRECT_OPS config DMA_DIRECT_OPS
bool bool
depends on HAS_DMA && (!64BIT || ARCH_DMA_ADDR_T_64BIT) depends on HAS_DMA && (!64BIT || ARCH_DMA_ADDR_T_64BIT)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment