diff options
author | Christoph Hellwig <hch@lst.de> | 2018-04-24 09:00:54 +0200 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2018-05-09 06:58:01 +0200 |
commit | 09230cbc1baba68e0ca1e7c489344ce5d35c6f27 (patch) | |
tree | d125ba685e491df0cfb05660e30ece8a84a10643 /arch/x86/Kconfig | |
parent | 8d9b409b1a42db9986dfe2d510fe7aea7a98a203 (diff) | |
download | lwn-09230cbc1baba68e0ca1e7c489344ce5d35c6f27.tar.gz lwn-09230cbc1baba68e0ca1e7c489344ce5d35c6f27.zip |
swiotlb: move the SWIOTLB config symbol to lib/Kconfig
This way we have one central definition of it, and user can select it as
needed. The new option is not user visible, which is the behavior
it had in most architectures, with a few notable exceptions:
- On x86_64 and mips/loongson3 it used to be user selectable, but
defaulted to y. It now is unconditional, which seems like the right
thing for 64-bit architectures without guaranteed availablity of
IOMMUs.
- on powerpc the symbol is user selectable and defaults to n, but
many boards select it. This change assumes no working setup
required a manual selection, but if that turned out to be wrong
we'll have to add another select statement or two for the respective
boards.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 31aad36d7ba9..f2ee6a8ffe65 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -29,6 +29,7 @@ config X86_64 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 @@ -919,17 +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 - select NEED_DMA_MAP_STATE - ---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 MAXSMP bool "Enable Maximum number of SMP Processors and NUMA Nodes" depends on X86_64 && SMP && DEBUG_KERNEL |